Chore: Revert back to ubuntu1804-docker

jjb/aai/aai-aai-common.yaml
jjb/aai/aai-babel.yaml
jjb/aai/aai-graphadmin.yaml
jjb/aai/aai-graphgraph.yaml
jjb/aai/aai-model-loader.yaml
jjb/aai/aai-resources.yaml
jjb/aai/aai-schema-service.yaml
jjb/aai/aai-sparky-be.yaml
jjb/aai/aai-traversal.yaml
jjb/ccsdk/apps.yaml
jjb/cli/cli.yaml
jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
jjb/integration/docker/integration-docker-onap-python.yaml
jjb/integration/integration-data-provider.yaml
jjb/integration/integration-docker.yaml
jjb/integration/integration-templates-csit.yaml
jjb/integration/integration-templates-docker.yaml
jjb/integration/integration.yaml
jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
jjb/integration/simulators/integration-core-nssmf-simulator.yaml
jjb/integration/simulators/integration-pnf-simulator.yaml
jjb/integration/simulators/integration-ran-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
jjb/sdc/sdc-sdc-distribution-client.yaml
jjb/sdc/sdc-sdc-docker-base.yaml
jjb/sdc/sdc-sdc-helm-validator.yaml
jjb/sdc/sdc-sdc-workflow-designer.yaml
jjb/sdc/sdc.yaml
jjb/sdnc/sdnc-apps.yaml
jjb/sdnc/sdnc-oam.yaml
jjb/so/so-adapters-so-cnf-adapter.yaml
jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
jjb/so/so-adapters-so-nssmf-adapter.yaml
jjb/so/so-adapters-so-oof-adapter.yaml
jjb/so/so-so-admin-cockpit.yaml
jjb/so/so-so-etsi-nfvo.yaml
jjb/so/so.yaml
jjb/vvp/vvp-test-engine.yaml
jjb/vvp/vvp-validation-scripts.yaml

Issue-ID: CIMAN-33
Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Change-Id: I11105d9ef07c3748f5b2c9c5f82b328eafd00718

47 files changed, 123 insertions, 123 deletions

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index c5f819466..c43e70277 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -88,7 +88,7 @@
       - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
     project-name: 'aai-aai-common'
@@ -104,13 +104,13 @@
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: 'Dockerfiles/aai-common/**'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk8
 
 - project:
     name: 'aai-aai-common-whitesource'
     project-name: 'aai-aai-common'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-params: '-P spring-boot-2-1'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index df9699e0c..823b7d43c 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -19,7 +19,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index c009f1f2a..12b6efcd4 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -18,7 +18,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 173ffe56b..484c8be59 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -18,7 +18,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 4fd9f9495..bfc961eb0 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -19,7 +19,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -87,7 +87,7 @@
 - project:
     name: 'aai-model-loader-whitesource'
     project-name: 'aai-model-loader'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 8b3d49ea3..6ffc4234c 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -10,9 +10,9 @@
     project-name: 'aai-resources'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
@@ -21,7 +21,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -50,7 +50,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'
@@ -89,7 +89,7 @@
 - project:
     name: 'aai-resources-whitesource'
     project-name: 'aai-resources'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-resources-settings'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index b1ef066dc..8fdaf1187 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -18,7 +18,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index f06e57ed6..a1a5c3352 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -19,7 +19,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -86,7 +86,7 @@
 - project:
     name: 'aai-sparky-be-whitesource'
     project-name: 'aai-sparky-be'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 9a7683911..7273498f1 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -10,9 +10,9 @@
     project-name: 'aai-traversal'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
@@ -21,7 +21,7 @@
           sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -49,7 +49,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 32b4e5053..9fb97a0c8 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -106,7 +106,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu2004-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: ccsdk-apps-info
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 6d35cc817..3f1c3519c 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -29,7 +29,7 @@
           pom: 'deployment/docker/pom.xml'
           mvn-goals: 'docker:build'
           docker-image-name: 'onap/cli'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     stream:
         - 'master':
@@ -59,7 +59,7 @@
 #    mvn-settings: 'cli-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu2004-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: cli-sonar
@@ -113,7 +113,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     project-name: 'cli'
     branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index da1d88235..4599e94d6 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -10,7 +10,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean deploy docker:build -DpushImage'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -37,7 +37,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
@@ -50,7 +50,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/analytics/tca-gen2'
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
@@ -67,7 +67,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/analytics/tca-gen2
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-analytics-tca-gen2'
     stream:
       - 'master':
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 750b24aa9..510befec2 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -16,7 +16,7 @@
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     jobs:
@@ -33,7 +33,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/datafile'
     project-name: 'dcaegen2-collectors-datafile'
     branch: 'master'
@@ -63,7 +63,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/datafile
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-datafile'
     stream:
       - 'master':
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index c071fb694..bef9324fb 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -18,7 +18,7 @@
     archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-maven-verify:
           pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
@@ -34,7 +34,7 @@
           maven-versions-plugin: true
           mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-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: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -50,7 +50,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/hv-ves'
     project-name: 'dcaegen2-collectors-hv-ves'
     branch: 'master'
@@ -69,7 +69,7 @@
     stream:
       - 'master':
           branch: 'master'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
 
 
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 27f83c834..54e9b3f81 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -13,7 +13,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -35,7 +35,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu2004-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-collectors-restconf-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/restconf'
     project-name: 'dcaegen2-collectors-restconf'
     branch: 'master'
@@ -63,7 +63,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/restconf
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-restconf'
     stream:
       - 'master':
diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
index a143963f0..f74b5b3aa 100644
--- a/jjb/integration/docker/integration-docker-onap-python.yaml
+++ b/jjb/integration/docker/integration-docker-onap-python.yaml
@@ -60,4 +60,4 @@
     docker-build-args: '-f ./Dockerfile'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml
index 1cb187e3b..3ec66f8c6 100644
--- a/jjb/integration/integration-data-provider.yaml
+++ b/jjb/integration/integration-data-provider.yaml
@@ -72,7 +72,7 @@
     docker-name: 'onap/data-provider'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: integration-data-provider-release
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 59b4f28fa..8a4cf0d85 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -43,7 +43,7 @@
         # To simplify the references inside tox.ini and tests/settings.py
         docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
         tox
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 20
     jobs:
       - gerrit-docker-verify
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 94e40d328..95d8fb36d 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -4,7 +4,7 @@
     disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu2004-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -67,7 +67,7 @@
     disabled: '{disabled}'
 
     project-type: freestyle
-    build-node: 'ubuntu2004-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -139,7 +139,7 @@
     branch: master
     build-concurrent: false
     build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     build-timeout: 60
     container-public-registry: 'nexus3.onap.org:10001'
     git-url: "$GIT_URL/$PROJECT"
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index 6a1aa3b7c..a0fafde4e 100644
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -3,7 +3,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-merge'
     id: integration-docker-merge
     project-type: freestyle
-    node: 'ubuntu2004-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
     mvn-goals: 'clean package docker:build docker:push'
 
@@ -65,7 +65,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-verify'
     id: integration-docker-verify
     project-type: freestyle
-    node: 'ubuntu2004-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
     mvn-goals: 'clean package docker:build'
     post-docker-verify-script: ''
@@ -130,7 +130,7 @@
     id: integration-docker-compose-verify
     project-type: freestyle
     description: 'This job validates Docker Compose based projects'
-    node: 'ubuntu2004-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker_root: '$WORKSPACE'
     post_script: ''
     netconf_sim_service_name: ''
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 047b81cad..918e1a60f 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -65,7 +65,7 @@
       - 'test-security-sslendpoints':
           path: 'test/security/sslendpoints'
           pattern: '{path}/**'
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
index 873371aaf..ed7c32e2b 100644
--- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
+++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
@@ -17,7 +17,7 @@
           branch: 'master'
     mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     subproject:
       - 'AMF':
           path: 'coresim/AMF/'
diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
index c34dd84a6..17d3d9be2 100644
--- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
+++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
@@ -19,7 +19,7 @@
     mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
         - '{project-name}-{stream}-verify-java':
             mvn-goals: 'clean install'
diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 624373c63..73a604b40 100644
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -19,7 +19,7 @@
     maven-deploy-properties: |
         deployAtEnd=true
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
         - '{project-name}-{stream}-verify-java':
             mvn-goals: 'clean install'
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index d9fd63f8f..feae0d44a 100644
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -12,7 +12,7 @@
       maven-deploy-properties: |
           deployAtEnd=true
       archive-artifacts: ''
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
                 mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
@@ -26,7 +26,7 @@
                 maven-versions-plugin: true
                 mvn-goals: 'clean deploy'
           - gerrit-maven-docker-stage:
-                build-node: ubuntu2004-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: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -42,7 +42,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       project: integration/simulators/pnf-simulator
       project-name: integration-pnf-simulator
       branch: 'master'
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 0c1c736c7..2c8584c26 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -10,7 +10,7 @@
       maven-deploy-properties: |
           deployAtEnd=true
       archive-artifacts: ''
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       jobs:
           - '{project-name}-{stream}-verify-java':
                 mvn-goals: 'clean install'
diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index 9589354f3..ac0c0649f 100644
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -11,7 +11,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
-                build-node: ubuntu2004-docker-8c-8g
+                build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
                 mvn-goals: 'clean install -P docker -DskipDockerPush=false'
@@ -30,7 +30,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu2004-docker-8c-8g'
+      build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-pm-https-server-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       project: 'integration/simulators/nf-simulator/pm-https-server'
       project-name: 'integration-simulators-nf-simulator-pm-https-server'
       branch: 'master'
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index f5ea55c9e..4caba8286 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -11,7 +11,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
-                build-node: ubuntu2004-docker-8c-8g
+                build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
                 mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
@@ -30,7 +30,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu2004-docker-8c-8g'
+      build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-avcn-manager-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       project: 'integration/simulators/nf-simulator/avcn-manager'
       project-name: 'integration-simulators-nf-simulator-avcn-manager'
       branch: 'master'
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index c43353212..a3345c8cc 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -12,7 +12,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
-                build-node: ubuntu2004-docker-8c-8g
+                build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
                 mvn-goals: 'clean install -P docker -DskipDockerPush=false'
@@ -31,7 +31,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu2004-docker-8c-8g'
+      build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-netconf-server-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       project: 'integration/simulators/nf-simulator/netconf-server'
       project-name: 'integration-simulators-nf-simulator-netconf-server'
       branch: 'master'
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index f18a9bcb0..299457328 100644
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -11,7 +11,7 @@
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: true
           - gerrit-maven-docker-stage:
-                build-node: ubuntu2004-docker-8c-8g
+                build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
                 mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
@@ -30,7 +30,7 @@
           deployAtEnd=true
       files: '**'
       archive-artifacts: ''
-      build-node: 'ubuntu2004-docker-8c-8g'
+      build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
       name: integration-simulators-nf-simulator-ves-client-sonar
@@ -43,7 +43,7 @@
       sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
-      build-node: ubuntu2004-docker-8c-8g
+      build-node: ubuntu1804-docker-8c-8g
       project: 'integration/simulators/nf-simulator/ves-client'
       project-name: 'integration-simulators-nf-simulator-ves-client'
       branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 28f4083d2..135ea5dee 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -37,7 +37,7 @@
     java-version: openjdk11
     jobs:
        - '{project-name}-{stream}-integration-pairwise'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'sdc/sdc-distribution-client'
     project-name: 'sdc-sdc-distribution-client'
     stream:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index bad80838e..12a33a6d0 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -5,14 +5,14 @@
     project-name: 'sdc-sdc-docker-base'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: 'ubuntu2004-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-v1-8c-8g'
           docker-pom: 'pom.xml'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu2004-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'default'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P default'
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 7bbf0307b..39010d320 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -26,7 +26,7 @@
           maven-versions-plugin: true
           mvn-goals: 'clean deploy'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean install docker:build docker:push'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -40,7 +40,7 @@
             branch: 'master'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 
 - project:
@@ -54,7 +54,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'sdc/sdc-helm-validator'
     project-name: 'sdc-sdc-helm-validator'
     branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index d35635a84..87528eeff 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -17,7 +17,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 621eac890..46b4b79ea 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,9 +30,9 @@
       - '{project-name}-{stream}-verify-java':
           # this build is unit test only (Verify 1/2)
           mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
-          build-node: 'ubuntu2004-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-8g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu2004-docker-8c-16g'
+          build-node: 'ubuntu1804-docker-8c-16g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator'
@@ -53,7 +53,7 @@
           maven-versions-plugin: true
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
           mvn-version: 'mvn36'
@@ -73,7 +73,7 @@
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     maven-version: 'mvn36'
 
 - project:
@@ -87,7 +87,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-16g
+    build-node: ubuntu1804-docker-8c-16g
     project: 'sdc'
     project-name: 'sdc'
     branch: 'master'
@@ -108,7 +108,7 @@
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
@@ -130,7 +130,7 @@
 - project:
     name: 'sdc-whitesource'
     project-name: 'sdc'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan:
           build-timeout: 120
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 135973e05..2287a8cdd 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -10,7 +10,7 @@
     project-name: 'sdnc-apps'
     jobs:
       - gerrit-maven-verify:
-          build-node: ubuntu2004-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: '-Ddocker.skip.push=true -Pdocker'
@@ -24,7 +24,7 @@
           cron: ''
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-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 -Pdocker'
@@ -94,7 +94,7 @@
 #    mvn-settings: 'sdnc-apps-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu2004-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 574974006..34666de1e 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -15,7 +15,7 @@
           cron: ''
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-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 -Ddocker.skip.run=true -Pdocker'
@@ -57,7 +57,7 @@
 #    mvn-settings: 'sdnc-oam-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu2004-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-oam-clm
diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index f46cc4d3b..e0f1fa141 100644
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-cnf-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-cnf-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/adapters/so-cnf-adapter'
     project-name: 'so-adapters-so-cnf-adapter'
     branch: 'master'
diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index 1c4e5b1c7..86f3f21a6 100644
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-etsi-sol003-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/adapters/so-etsi-sol003-adapter'
     project-name: 'so-adapters-so-etsi-sol003-adapter'
     branch: 'master'
@@ -72,7 +72,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/adapters/so-etsi-sol003-adapter'
     project-name: 'so-adapters-so-etsi-sol003-adapter'
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index 398852ff2..2d1a8d545 100644
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-etsi-sol005-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/adapters/so-etsi-sol005-adapter'
     project-name: 'so-adapters-so-etsi-sol005-adapter'
     branch: 'master'
diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index 88b6eeca9..d230d005e 100644
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -45,7 +45,7 @@
     mvn-settings: 'so-adapters-so-nssmf-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-nssmf-adapter-sonar
@@ -59,7 +59,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/adapters/so-nssmf-adapter'
     project-name: 'so-adapters-so-nssmf-adapter'
     branch: 'master'
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 2fbec6a08..2138fcf9a 100644
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-adapters-so-oof-adapter-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-adapters-so-oof-adapter-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/adapters/so-oof-adapter'
     project-name: 'so-adapters-so-oof-adapter'
     branch: 'master'
diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml
index ab625623f..7e5614400 100644
--- a/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-so-admin-cockpit-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-so-admin-cockpit-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/so-admin-cockpit'
     project-name: 'so-so-admin-cockpit'
     branch: 'master'
@@ -70,7 +70,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu2004-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     project: 'so/so-admin-cockpit'
     project-name: 'so-so-admin-cockpit'
     branch: 'master'
@@ -101,7 +101,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/so-admin-cockpit'
     project-name: 'so-so-admin-cockpit'
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index ee6b43fce..5a54d934a 100644
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -24,7 +24,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -42,7 +42,7 @@
     mvn-settings: 'so-so-etsi-nfvo-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-so-etsi-nfvo-sonar
@@ -56,7 +56,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so/so-etsi-nfvo'
     project-name: 'so-so-etsi-nfvo'
     branch: 'master'
@@ -72,7 +72,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'so/so-etsi-nfvo'
     project-name: 'so-so-etsi-nfvo'
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 716bd6559..510e10879 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -17,7 +17,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -38,7 +38,7 @@
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-sonar
@@ -52,7 +52,7 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -66,7 +66,7 @@
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
-    build-node: 'ubuntu2004-docker-v1-8c-8g'
+    build-node: 'ubuntu1804-docker-v1-8c-8g'
     project: 'so'
     project-name: 'so'
     branch: 'master'
@@ -97,7 +97,7 @@
     nexus-iq-namespace: 'onap-'
     project: so
     project-name: 'so'
-    build-node: ubuntu2004-docker-v1-8c-8g
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 75c754f86..36a51fc34 100644
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -19,7 +19,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'vvp/test-engine'
     project-name: 'vvp-test-engine'
     branch: 'master'
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 6480ab2f8..9f9b85e10 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -12,7 +12,7 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-validation-scripts-settings'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
@@ -32,7 +32,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
     branch: 'master'
@@ -44,7 +44,7 @@
     name: vvp-validation-scripts-tracability-matrix
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
-    build-node: ubuntu2004-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-settings: 'vvp-validation-scripts-settings'
     mvn-global-settings: 'global-settings'
     stream: