diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index 2134d46..6d9639f 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: 'voltha-1804-micro'
+          build-node: 'ubuntu-basebuild-24.04-4c-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: '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 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 61105c8..622334b 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: '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: 'master'
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index e223028..db041a7 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: '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'
@@ -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: 'voltha-1804-micro'          
+          build-node: 'ubuntu-basebuild-24.04-4c-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'