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'