diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index c185076..e228560 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -28,7 +28,7 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -69,7 +69,7 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -94,7 +94,7 @@
           config-pod: 'flex-ocp-cord'
           release: '2.6'
           branch: 'voltha-2.6'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -121,7 +121,7 @@
           config-pod: 'flex-ocp-cord'
           release: '2.6'
           branch: 'voltha-2.6'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           name-extension: '_TT'
@@ -151,7 +151,7 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           name-extension: '_TT'
@@ -269,7 +269,7 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -296,7 +296,7 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           name-extension: '_DT'
@@ -331,7 +331,7 @@
           branch: 'voltha-2.6'
           name-extension: '_DT'
           work-flow: 'DT'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -365,7 +365,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T4GEM'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           in-band-management: true
@@ -383,7 +383,7 @@
           config-pod: 'onf-demo-pod'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -552,7 +552,7 @@
           config-pod: 'infosys-pod'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           profile: 'Default'
@@ -573,7 +573,7 @@
           branch: 'master'
           name-extension: '_DT'
           work-flow: 'DT'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -602,7 +602,7 @@
           config-pod: 'dt-berlin-pod'
           release: '2.6'
           branch: 'voltha-2.6'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
@@ -628,7 +628,7 @@
           config-pod: 'dt-berlin-pod-gpon'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           name-extension: '_DT'
@@ -659,7 +659,7 @@
           config-pod: 'dt-berlin-pod-gpon'
           release: '2.6'
           branch: 'voltha-2.6'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           num-of-onos: '3'
           num-of-atomix: '3'
           name-extension: '_DT'
@@ -722,7 +722,7 @@
           config-pod: 'dt-berlin-pod-gpon'
           release: 'master'
           branch: 'master'
-          num-of-openonu: '2'
+          num-of-openonu: '1'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           profile: 'Default'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 71989d0..096085f 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -136,7 +136,7 @@
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
           oltDebVersionMaster: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
-          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
 
       # Per-patchset Pod builds on Tucson pod
@@ -145,7 +145,7 @@
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
           oltDebVersionMaster: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
-          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
           trigger-string: 'hardware test'
           default-test-args: '-i sanityORDeleteOLT -X'
@@ -157,7 +157,7 @@
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod-DT'
           oltDebVersionMaster: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
-          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
           pipeline-script: 'voltha-dt-physical-build-and-tests.groovy'
           trigger-string: 'DT hardware test'
@@ -173,7 +173,7 @@
           config-pod: 'tucson-pod'
           manualBranch: 'master'
           oltDebVersionMaster: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
-          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
 
 - job-template: