diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index 6be8d54..c0f8c81 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -30,7 +30,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/bbr.yaml b/jjb/bbr.yaml
index 54ae3a5..2929922 100644
--- a/jjb/bbr.yaml
+++ b/jjb/bbr.yaml
@@ -49,7 +49,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
 # [EOF]
diff --git a/jjb/device-management.yaml b/jjb/device-management.yaml
index 622a814..ba77feb 100644
--- a/jjb/device-management.yaml
+++ b/jjb/device-management.yaml
@@ -29,7 +29,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index a251c2f..907de39 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -102,7 +102,7 @@
           build-timeout: 30
           docker-repo: 'omecproject'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
       - 'omec-container'
 
 # for c3po
diff --git a/jjb/triggered-api-test.yaml b/jjb/triggered-api-test.yaml
index 9a03d57..ff191ae 100644
--- a/jjb/triggered-api-test.yaml
+++ b/jjb/triggered-api-test.yaml
@@ -31,7 +31,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 61ddb43..4631760 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -52,7 +52,7 @@
           dependency-jobs: 'verify_bbsim_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 3690739..a39b218 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -33,7 +33,7 @@
           dependency-jobs: 'verify_ofagent-go_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 2bf2bbb..a0bf4b1 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -33,7 +33,7 @@
           dependency-jobs: 'verify_voltha-go_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           build-timeout: 20
           dest-gopath: "github.com/opencord"
           name-extension: "-lint"
diff --git a/jjb/verify/voltha-lib-go.yaml b/jjb/verify/voltha-lib-go.yaml
index 584c876..9203685 100644
--- a/jjb/verify/voltha-lib-go.yaml
+++ b/jjb/verify/voltha-lib-go.yaml
@@ -38,7 +38,7 @@
           dependency-jobs: 'verify_voltha-lib-go_licensed'
       - 'make-unit-test':
 #          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           build-timeout: 20
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index da95bb6..19de589 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -21,7 +21,7 @@
           dependency-jobs: 'verify_voltha-northbound-bbf-adapter_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 9f6d50d..3697c96 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -33,7 +33,7 @@
           unit-test-targets: 'lint sca'
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
@@ -42,7 +42,7 @@
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
           # build-node: 'ubuntu18.04-basebuild-2c-4g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
 
 - job-group:
     name: 'verify-voltha-openolt-adapter-jobs-master'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index db48e31..49ef6a5 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -37,7 +37,7 @@
           unit-test-keep-going: 'false'
           junit-allow-empty-results: true
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-tests"
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 229fbc7..99c98e8 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -20,7 +20,7 @@
       - 'tag-collision-reject':
       - 'make-unit-test':
 #          build-node: 'ubuntu18.04-basebuild-2c-4g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           build-timeout: 20
           unit-test-targets: 'test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index d1e3db6..f933b63 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -8,21 +8,21 @@
     jobs:
       - 'verify-voltha-system-tests-jobs':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-system-tests-jobs-master':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           branch-regexp: '^master$'
       - 'verify-voltha-system-tests-jobs-voltha-2.12':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           name-extension: '-voltha-2.12'
           override-branch: 'voltha-2.12'
           branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-system-tests-jobs-voltha-2.11':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 75525c5..a273a78 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -52,7 +52,7 @@
       - 'python-unit-test':
           build-timeout: 45
           # build-node: 'ubuntu18.04-basebuild-2c-4g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
       - 'api-test':
           pipeline-script: 'xos-core.groovy'
 
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 87383fc..dac53fe 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1808,7 +1808,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
           time-trigger: "H H/12 * * *"
@@ -1838,7 +1838,7 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'voltha-2.11'
           extraHelmFlags: '--set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
@@ -1854,7 +1854,7 @@
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'voltha-2.12'
           extraHelmFlags: '--set onu=2,pon=2'
           time-trigger: "H H/23 * * *"
@@ -1965,7 +1965,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,controlledActivation=only-onu'
@@ -1984,7 +1984,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.12'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
           code-branch: 'voltha-2.12'
@@ -2002,7 +2002,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
           code-branch: 'voltha-2.11'
@@ -2299,7 +2299,7 @@
     id: 'voltha-patch-test'
     name: 'verify_{project}_sanity-test{name-extension}'
     #build-node: 'ubuntu18.04-basebuild-4c-8g'
-    build-node: 'ubuntu-basebuild-24.04-4c-15g'
+    build-node: 'ubuntu18.04-basebuild-8c-15g'
     pipeline-script: 'voltha/bbsim-tests.groovy'
     pipeline-branch: 'master'
     override-branch: '$GERRIT_BRANCH'
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index 6d9639f..39472cd 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -154,7 +154,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-master'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'master'
           code-branch: 'master'
@@ -177,7 +177,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim-master'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index 622334b..3faa86b 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -146,7 +146,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-2.11'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'
+          build-node: 'ubuntu18.04-basebuild-8c-15g'
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
           code-branch: 'master'
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index db041a7..3d29c78 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -155,7 +155,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim-2.12'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'          
+          build-node: 'ubuntu18.04-basebuild-8c-15g'          
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
           code-branch: 'voltha-2.12'
@@ -186,7 +186,7 @@
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim-2.12'
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu-basebuild-24.04-4c-15g'          
+          build-node: 'ubuntu18.04-basebuild-8c-15g'          
           code-branch: 'VOLTHA-2.12'
           time-trigger: "H H/23 * * *"
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
diff --git a/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index e759d0e..3ebca62 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -39,7 +39,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     # node: 'ubuntu18.04-basebuild-4c-8g'
-    node: 'ubuntu-basebuild-24.04-4c-15g'
+    node: 'ubuntu18.04-basebuild-8c-15g'
     project-type: freestyle
     concurrent: true
 
diff --git a/jjb/xos-auth.yaml b/jjb/xos-auth.yaml
index e6ff876..64ccb2e 100644
--- a/jjb/xos-auth.yaml
+++ b/jjb/xos-auth.yaml
@@ -33,7 +33,7 @@
           destination-dir: 'cord'
 
     # node: 'ubuntu18.04-basebuild-4c-8g'
-    node: 'ubuntu-basebuild-24.04-4c-15g'
+    node: 'ubuntu18.04-basebuild-8c-15g'
     project-type: freestyle
     concurrent: true
 
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index e5f3109..c67d2df 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -36,7 +36,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'          
+          default: 'ubuntu18.04-basebuild-8c-15g'          
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
@@ -91,7 +91,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'          
+          default: 'ubuntu18.04-basebuild-8c-15g'          
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
@@ -146,7 +146,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
@@ -201,7 +201,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/xos-synchronizer-update.yaml b/jjb/xos-synchronizer-update.yaml
index 5f594e5..6b5e0d2 100644
--- a/jjb/xos-synchronizer-update.yaml
+++ b/jjb/xos-synchronizer-update.yaml
@@ -29,7 +29,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string:
diff --git a/jjb/xos-upgrade.yaml b/jjb/xos-upgrade.yaml
index 4592723..d20e57d 100644
--- a/jjb/xos-upgrade.yaml
+++ b/jjb/xos-upgrade.yaml
@@ -30,7 +30,7 @@
       - string:
           name: buildNode
           # default: 'ubuntu18.04-basebuild-4c-8g'
-          default: 'ubuntu-basebuild-24.04-4c-15g'
+          default: 'ubuntu18.04-basebuild-8c-15g'
           description: 'Name of the Jenkins node to run the job on'
 
       - string: