diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index c0a48f7..87383fc 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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: 'voltha-1804-micro'
+    build-node: 'ubuntu-basebuild-24.04-4c-15g'
     pipeline-script: 'voltha/bbsim-tests.groovy'
     pipeline-branch: 'master'
     override-branch: '$GERRIT_BRANCH'