diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index c43e702..f5f44f0 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -30,7 +30,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
@@ -43,7 +43,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'master'
@@ -59,7 +59,7 @@
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     stream:
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 823b7d4..b55d06a 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -33,7 +33,7 @@
     mvn-settings: 'aai-babel-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
     mvn-version: 'mvn36'
     nexus-snapshot-repo: 'snapshots'
@@ -49,7 +49,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/babel'
     project-name: 'aai-babel'
     branch: 'master'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 12b6efc..593a6aa 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -33,7 +33,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
     branch: 'master'
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 484c8be..dc9a63f 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/graphgraph'
     project-name: 'aai-graphgraph'
     branch: 'master'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index ef47318..f211a26 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
     branch: 'master'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index bfc961e..cc3b665 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -33,7 +33,7 @@
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-version: 'mvn36'
     java-version: openjdk11
     nexus-snapshot-repo: 'snapshots'
@@ -49,7 +49,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 6ffc423..b8eb752 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -37,7 +37,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index a26b6ec..45bdd0a 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     branch: 'master'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 8fdaf11..663dc3b 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -33,7 +33,7 @@
     mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
 
 - project:
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a1a5c33..e86672f 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
     branch: 'master'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index e25120a..0f0bd8d 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          build-node: ubuntu2004-builder-4c-4g
+          build-node: ubuntu1804-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/sparky-fe'
     project-name: 'aai-sparky-fe'
     branch: 'master'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 7273498..1e8f382 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -36,7 +36,7 @@
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 9fb97a0..399c1bc 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -62,7 +62,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
@@ -89,7 +89,7 @@
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: ccsdk-apps-arm64-docker
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 3f1c351..bc94556 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -41,7 +41,7 @@
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: cli-arm64
@@ -72,7 +72,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
@@ -90,7 +90,7 @@
     project-name: 'cli'
     branch: 'master'
     mvn-settings: 'cli-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: cli-info
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index a574666..911be77 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/collectors/snmptrap'
     project-name: 'dcaegen2-collectors-snmptrap'
     branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 4346df2..b0d6470 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dcaegen2/services/mapper'
     project-name: 'dcaegen2-services-mapper'
     branch: 'master'
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index d031760..5af7739 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -40,7 +40,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'demo'
     project-name: 'demo'
     branch: 'master'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 7886d44..b74439e 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -57,7 +57,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/buscontroller'
     project-name: 'dmaap-buscontroller'
     branch: 'master'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index d5e504b..530a7b2 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -52,7 +52,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/datarouter'
     project-name: 'dmaap-datarouter'
     branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index c779200..34fe57b 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -32,7 +32,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/dmaapclient'
     project-name: 'dmaap-messagerouter-dmaapclient'
     branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 4429058..a679666 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -54,7 +54,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/messageservice'
     project-name: 'dmaap-messagerouter-messageservice'
     branch: 'master'
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 24ff699..6bda3cb 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -32,7 +32,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: externalapi-nbi-arm64
@@ -74,7 +74,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
     branch: 'master'
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index f81e8c2..f285698 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -41,7 +41,7 @@
 
     # Timeout in minutes
     build-timeout: 90
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     archive-artifacts: ''
 
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index aa26a48..20e0f61 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -33,7 +33,7 @@
     mvn-settings: 'holmes-common-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
 
 - project:
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/common'
     project-name: 'holmes-common'
     branch: 'master'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 1196d39..1c49166 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -33,7 +33,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
 
 - project:
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/engine-management'
     project-name: 'holmes-engine-management'
     branch: 'master'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 1b4f4e4..1177923 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -33,7 +33,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
 
 - project:
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'holmes/rule-management'
     project-name: 'holmes-rule-management'
     branch: 'master'
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c70712d..77be42b 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -8,7 +8,7 @@
     name: '{project-name}-{stream}-verify-vagrantfile'
     project-type: freestyle
     description: 'Job intended for validating vagrantfiles'
-    node: ubuntu2004-builder-4c-4g
+    node: ubuntu1804-builder-4c-4g
 
     parameters:
       - lf-infra-parameters:
@@ -57,7 +57,7 @@
     id: integration-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     node: '{build-node}'
 
     parameters:
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 918e1a6..cb8286d 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -22,7 +22,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'integration-settings'
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'test-vcpe':
           path: 'test/vcpe'
@@ -56,7 +56,7 @@
       - 'test-security-k8s':
           path: 'test/security/k8s'
           pattern: '{path}/**'
-          build-node: ubuntu2004-builder-4c-4g
+          build-node: ubuntu1804-builder-4c-4g
           script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
index 6d6296b..e260745 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
@@ -14,7 +14,7 @@
           - 'master':
                 branch: 'master'
       mvn-settings: 'integration-simulators-nf-simulator-settings'
-      build-node: ubuntu2004-builder-4c-4g
+      build-node: ubuntu1804-builder-4c-4g
       jobs:
           - '{project-name}-{stream}-{subproject}-verify-python'
 
@@ -23,7 +23,7 @@
       jobs:
           - gerrit-tox-sonar
       cron: '@daily'
-      build-node: ubuntu2004-builder-4c-4g
+      build-node: ubuntu1804-builder-4c-4g
       project: 'integration/simulators/nf-simulator'
       project-name: 'integration-simulators-nf-simulator'
       branch: 'master'
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index b346dad..234d1fc 100644
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -4,7 +4,7 @@
     description: '{job-desc}'
     disabled: false
     project-type: freestyle
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     properties:
       - lf-infra-properties:
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index cdd9cdc..8dead6d 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -30,7 +30,7 @@
             build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: modeling-etsicatalog-sonar
@@ -42,7 +42,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'modeling/etsicatalog'
     project-name: 'modeling-etsicatalog'
     branch: 'master'
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 0c83f05..b2d8bed 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -33,7 +33,7 @@
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-apigateway-arm64
@@ -64,7 +64,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-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 5d5de9a..72fab4c 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -27,7 +27,7 @@
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-discovery-arm64
@@ -57,7 +57,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-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 c9d8d74..5c599c3 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -18,7 +18,7 @@
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-java-sdk-sonar
@@ -30,7 +30,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-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 1f78d0f..00ac8a1 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -18,7 +18,7 @@
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-swagger-sdk-sonar
@@ -30,7 +30,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'msb/swagger-sdk'
     project-name: 'msb-swagger-sdk'
     branch: 'master'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 5ba682a..988d383 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -38,7 +38,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-framework-arm64-java
@@ -72,7 +72,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-multivimbroker'
     branch: 'master'
@@ -106,7 +106,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index 1b07c89..113bce7 100644
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -9,7 +9,7 @@
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'multicloud-framework-settings'
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'multivimbroker':
           path: 'multivimbroker'
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 0420320..428535a 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -35,7 +35,7 @@
     disable-kud: false
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: multicloud-k8s-arm64
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 7c848a7..686a8d6 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -31,7 +31,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     disabled: true
 
 #- project:
@@ -66,7 +66,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack/vmware'
     project-name: 'multicloud-openstack-vmware'
     branch: 'master'
@@ -82,7 +82,7 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack/vmware
     project-name: 'multicloud-openstack-vmware'
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
index 1998161..45cccb1 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'multicloud-openstack-vmware-settings'
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'vio':
           path: 'vio'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 60060fd..f78ca6d 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -106,7 +106,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-windriver'
     branch: 'master'
@@ -125,7 +125,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-pike'
     branch: 'master'
@@ -144,7 +144,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-starlingx'
     branch: 'master'
@@ -178,7 +178,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-fcaps'
     branch: 'master'
@@ -197,7 +197,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
 #    cron: '@daily'
-#    build-node: ubuntu2004-builder-4c-4g
+#    build-node: ubuntu1804-builder-4c-4g
 #    project: 'multicloud/openstack'
 #    project-name: 'multicloud-openstack-lenovo'
 #    branch: 'master'
@@ -216,7 +216,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-hpa'
     branch: 'master'
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 2d13516..0985d66 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -17,7 +17,7 @@
     mvn-settings: 'music-distributed-kv-store-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: music-distributed-kv-store-info
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 8b6b867..1450e9c 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -27,7 +27,7 @@
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 94623c2..93fabe7 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -26,7 +26,7 @@
     mvn-settings: 'oom-registrator-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: oom-registrator-clm
diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml
index a82cf34..3134bef 100644
--- a/jjb/oom/oom-templates.yaml
+++ b/jjb/oom/oom-templates.yaml
@@ -12,7 +12,7 @@
     id: oom-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     node: '{build-node}'
 
     parameters:
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 12acb61..513b73c 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -28,7 +28,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: oparent-clm
diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index b02699e..03b9be8 100644
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -25,7 +25,7 @@
 
     concurrent: false
 
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     parameters:
       - string:
@@ -71,7 +71,7 @@
 
     concurrent: false
 
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
     triggers:
       - jms-messaging:
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 970965d..cb52482 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -16,7 +16,7 @@
           pom: 'pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python':
-          build-node: ubuntu2004-builder-4c-4g
+          build-node: ubuntu1804-builder-4c-4g
       - '{project-name}-{stream}-{subproject}-merge-java':
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
@@ -35,7 +35,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-has-sonar
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 18865fb..0022aff 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -17,7 +17,7 @@
           pom: 'pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python':
-          build-node: ubuntu2004-builder-4c-4g
+          build-node: ubuntu1804-builder-4c-4g
       - '{project-name}-{stream}-{subproject}-merge-java':
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
@@ -36,7 +36,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-osdf-sonar
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index bacce4a..54c6a5c 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -54,7 +54,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/apex-pdp'
     project-name: 'policy-apex-pdp'
     branch: 'master'
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 1e27424..0378b89 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -36,7 +36,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-api-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/api'
     project-name: 'policy-api'
     branch: 'master'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index b8e3d3e..9b90698 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -27,7 +27,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-common-sonar
@@ -39,7 +39,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/common'
     project-name: 'policy-common'
     branch: 'master'
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 46110b4..53404fd 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -36,7 +36,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-distribution-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/distribution'
     project-name: 'policy-distribution'
     branch: 'master'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index acbd37e..74c9011 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -36,7 +36,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index ae3204e..7cbce56 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -49,7 +49,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/drools-applications'
     project-name: 'policy-drools-applications'
     branch: 'master'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index ccb8760..6153fe9 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/drools-pdp'
     project-name: 'policy-drools-pdp'
     branch: 'master'
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index eb901d8..f730693 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -34,7 +34,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-gui-sonar
@@ -46,7 +46,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/gui'
     project-name: 'policy-gui'
     branch: 'master'
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index b32905d..7bfdc8f 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -36,7 +36,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-models-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/models'
     project-name: 'policy-models'
     branch: 'master'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index cadb818..f0e6473 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -36,7 +36,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-pap-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/pap'
     project-name: 'policy-pap'
     branch: 'master'
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 5efff53..bf54cd0 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -27,7 +27,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-parent-clm
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 269dd5e..cdddf2f 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -36,7 +36,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-xacml-pdp-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/xacml-pdp'
     project-name: 'policy-xacml-pdp'
     branch: 'master'
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index d76cde0..e720f32 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -42,7 +42,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-angular'
     project-name: 'sdc-onap-ui-angular'
     branch: 'master'
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 798a644..ab23a67 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/onap-ui-common'
     project-name: 'sdc-onap-ui-common'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 647edd1..d365db5 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -39,7 +39,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-be-common'
     project-name: 'sdc-sdc-be-common'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 135ea5d..32d9507 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -61,7 +61,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-distribution-client'
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 12a33a6..5857c1c 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -28,7 +28,7 @@
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn36'
 
 - project:
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index ae78056..1cf4aad 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-pubsub'
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index b4c4f87..9b0c252 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -42,7 +42,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-tosca'
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 87528ee..e4eff9d 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -37,7 +37,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     maven-version: 'mvn36'
 
 - project:
@@ -50,7 +50,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
@@ -67,7 +67,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 2287a8c..7327717 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -53,7 +53,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn38"
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -67,7 +67,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
@@ -103,7 +103,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/apps
     project-name: 'sdnc-apps'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index d472d95..6c834a0 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -34,7 +34,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn38"
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdnc/northbound'
     project-name: 'sdnc-northbound'
     branch: 'master'
@@ -65,7 +65,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/northbound
     project-name: 'sdnc-northbound'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 34666de..e09e3ec 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -36,7 +36,7 @@
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     shallow-clone: true
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -66,7 +66,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/oam
     project-name: 'sdnc-oam'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index e0f23ce..9846475 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -39,7 +39,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
     java-version: openjdk11
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index 8d26177..e4983fd 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -17,7 +17,7 @@
     mvn-settings: 'testsuite-python-testing-utils-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: testsuite-python-testing-utils-verify
@@ -27,7 +27,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'testsuite-python-testing-utils-settings'
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'robotframework-onap':
           path: 'robotframework-onap'
@@ -40,6 +40,6 @@
     project-name: testsuite-python-testing-utils
     jobs:
       - gerrit-info-yaml-verify
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: testsuite/python-testing-utils
     branch: master
diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
index a991233..1a10bf1 100644
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@ -26,7 +26,7 @@
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-intent-analysis-sonar
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'usecase-ui/intent-analysis'
     project-name: 'usecase-ui-intent-analysis'
     branch: 'master'
@@ -54,7 +54,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui/intent-analysis
     project-name: 'usecase-ui-intent-analysis'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index 0791487..bb984ae 100644
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -24,7 +24,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-nlp-sonar
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'usecase-ui/nlp'
     project-name: 'usecase-ui-nlp'
     branch: 'master'
@@ -51,7 +51,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui/nlp
     project-name: 'usecase-ui-nlp'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-nlp-settings'
 
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 213710b..a4241e7 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -24,7 +24,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-server-sonar
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'usecase-ui/server'
     project-name: 'usecase-ui-server'
     branch: 'master'
@@ -51,7 +51,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui/server
     project-name: 'usecase-ui-server'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-server-settings'
 
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index da75aff..4965f82 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -29,7 +29,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-clm
@@ -38,7 +38,7 @@
     nexus-iq-namespace: 'onap-'
     project: usecase-ui
     project-name: 'usecase-ui'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'usecase-ui-settings'
 
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index ded6cb7..589a7ad 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -47,7 +47,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f lcm/pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnflcm'
     project-name: 'vfc-gvnfm-vnflcm-lcm'
     branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index 7ef2f84..797e0a0 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'lcm':
           path: 'lcm'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index d4760b1..1445f9b 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -28,7 +28,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfmgr-mgr-sonar
@@ -41,7 +41,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f mgr/pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnfmgr'
     project-name: 'vfc-gvnfm-vnfmgr-mgr'
     branch: 'master'
@@ -56,7 +56,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnfmgr
     project-name: 'vfc-gvnfm-vnfmgr'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
 
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index c99f1e3..2bb891b 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'mgr':
           path: 'mgr'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 290a533..6551d45 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -29,7 +29,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-gvnfm-vnfres-res-sonar
@@ -42,7 +42,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f res/pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/gvnfm/vnfres'
     project-name: 'vfc-gvnfm-vnfres-res'
     branch: 'master'
@@ -57,7 +57,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnfres
     project-name: 'vfc-gvnfm-vnfres'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
 
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index c98fc09..5bdf8e4 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'res':
           path: 'res'
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 5a6a3c9..679cc45 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -7,7 +7,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 8af1b6e..1db7b67 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -25,7 +25,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-sonar
@@ -38,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-params: '-f huawei/pom.xml'
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
@@ -56,7 +56,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-svnfm-huawei'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
 
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 77e955b..db89aff 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -31,7 +31,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
@@ -44,7 +44,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f gvnfmadapter/pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
     branch: 'master'
@@ -59,7 +59,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/gvnfm
     project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
 
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index 860d609..0cad04b 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'gvnfmadapter':
           path: 'gvnfmadapter'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
index 2424119..ac6138a 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -17,5 +17,5 @@
           build-node: ubuntu1804-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
index 599252b..52aee73 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml
@@ -21,7 +21,7 @@
           maven-versions-plugin: true
           mvn-params: '-P rootOnly'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-svnfm-root-info
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 4651b44..db2b6bb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-zte-sonar
@@ -37,7 +37,7 @@
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
     mvn-params: '-f zte/vmanager/pom.xml'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
     branch: 'master'
@@ -53,6 +53,6 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/driver/vnfm/svnfm
     project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 15a9025..5c77ac2 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'drv-vnfm-zte':
           path: 'zte/vmanager'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index ddc4574..89726b4 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -36,7 +36,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vfc/nfvo/lcm'
     project-name: 'vfc-nfvo-lcm'
     branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index f15dc63..19791ef 100644
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     subproject:
       - 'lcm':
           path: '.'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 22b9d28..49c7c01 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,7 +21,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -56,7 +56,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
@@ -80,7 +80,7 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/dovetail-integration
     project-name: 'vnfsdk-dovetail-integration'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 9bc1c34..19c88c3 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -17,7 +17,7 @@
     mvn-settings: 'vnfsdk-functest-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-functest-info
@@ -35,7 +35,7 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/functest
     project-name: 'vnfsdk-functest'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 26e33e4..6d22310 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -14,7 +14,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-pkgtools-settings'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{subproject}-python-staging-{stream}'
@@ -25,7 +25,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/pkgtools'
     project-name: 'vnfsdk-pkgtools'
     branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index a9d2819..519c447 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -28,7 +28,7 @@
     mvn-settings: 'vnfsdk-refrepo-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-refrepo-sonar
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/refrepo'
     project-name: 'vnfsdk-refrepo'
     branch: 'master'
@@ -66,7 +66,7 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/refrepo
     project-name: 'vnfsdk-refrepo'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 46e09f4..4364220 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -22,7 +22,7 @@
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: vnfsdk-validation-sonar
@@ -35,7 +35,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -60,7 +60,7 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/validation
     project-name: 'vnfsdk-validation'
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'