diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 044ea31..d7840af 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -103,6 +103,23 @@
           onosStatInterval: 30
           onosGroupInterval: 30
 
+      # 4k ONTs jobs
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-master-2-64-32-dt-subscribers'
+          'disable-job': false
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          olts: 2
+          pons: 64
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          extraHelmFlags: '-f /home/jenkins/voltha-scale/voltha-values.yaml --set uni=1 --set etcd.persistence.enabled=true,etcd.persistence.storageClass=longhorn'
+
       # multi-stack jobs
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-10-stacks-2-16-32-att-subscribers'
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index e9f4589..e7a2252 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -12,9 +12,11 @@
     power-switch: False
     work-flow: 'ATT'
     in-band-management: false
-    num-of-openonu: '1'
-    num-of-onos: '3'
-    num-of-atomix: '3'
+    num-of-openonu: 1
+    num-of-onos: 1
+    num-of-atomix: 1
+    num-of-kafka: 1
+    num-of-etcd: 1
     reinstall-olt: true
     test-type: ''
     volthaSystemTestsChange: ''
@@ -28,7 +30,7 @@
 
       # Certification (Radisys 1600G) pod with olt/onu - master versions timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-1'
           config-pod: 'menlo-certification-pod-radisys-1600g'
           disable-job: false
           reinstall-olt: true
@@ -41,7 +43,7 @@
       # Certification (Radisys 1600G) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-1'
           config-pod: 'menlo-certification-pod-radisys-1600g'
           disable-job: false
           release: 'master'
@@ -55,7 +57,7 @@
 
       # Certification (Radisys 1600X) pod with olt/onu - master versions timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-2'
           config-pod: 'menlo-certification-pod-radisys-1600x'
           disable-job: false
           reinstall-olt: true
@@ -68,7 +70,7 @@
       # Certification (Radisys 1600X) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-2'
           config-pod: 'menlo-certification-pod-radisys-1600x'
           disable-job: false
           release: 'master'
@@ -82,7 +84,7 @@
 
       # Certification (Radisys) pod with olt/onu - master versions timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-3'
           config-pod: 'menlo-certification-pod-radisys-3200g'
           disable-job: false
           reinstall-olt: true
@@ -95,7 +97,7 @@
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-3'
           config-pod: 'menlo-certification-pod-radisys-3200g'
           disable-job: false
           release: 'master'
@@ -109,7 +111,7 @@
 
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-3'
           config-pod: 'menlo-certification-pod-radisys-3200g'
           disable-job: false
           reinstall-olt: true
@@ -124,7 +126,7 @@
 
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-3'
           config-pod: 'menlo-certification-pod-radisys-3200g'
           disable-job: false
           release: '2.8'
@@ -138,7 +140,7 @@
 
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-1'
           config-pod: 'menlo-certification-pod-radisys-1600g'
           disable-job: false
           reinstall-olt: true
@@ -153,7 +155,7 @@
 
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-1'
           config-pod: 'menlo-certification-pod-radisys-1600g'
           disable-job: false
           release: '2.8'
@@ -167,7 +169,7 @@
 
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-2'
           config-pod: 'menlo-certification-pod-radisys-1600x'
           disable-job: false
           reinstall-olt: true
@@ -182,7 +184,7 @@
 
       # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
-          build-node: 'menlo-certification-pod'
+          build-node: 'menlo-certification-pod-2'
           config-pod: 'menlo-certification-pod-radisys-1600x'
           disable-job: false
           release: '2.8'
@@ -196,7 +198,7 @@
 
       # Certification (Radisys) pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
-            build-node: 'menlo-certification-pod'
+            build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
             disable-job: false
             reinstall-olt: true
@@ -206,7 +208,7 @@
 
       # Certification (Radisys) POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
-            build-node: 'menlo-certification-pod'
+            build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
             disable-job: false
             release: 'master'
@@ -219,7 +221,7 @@
 
         # Certification (Radisys) pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
-            build-node: 'menlo-certification-pod'
+            build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
             disable-job: false
             reinstall-olt: true
@@ -229,7 +231,7 @@
 
         # Certification (Radisys) POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
-            build-node: 'menlo-certification-pod'
+            build-node: 'menlo-certification-pod-3'
             config-pod: 'menlo-certification-pod-radisys-3200g'
             disable-job: false
             release: 'master'