diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 84a5695..a6c62c1 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -380,6 +380,8 @@
           release: 'master'
           branch: 'master'
           num-of-openonu: '2'
+          num-of-onos: '3'
+          num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
@@ -431,6 +433,8 @@
           release: 'master'
           branch: 'master'
           num-of-openonu: '2'
+          num-of-onos: '3'
+          num-of-atomix: '3'
           name-extension: '_DT'
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
diff --git a/jjb/device-management.yaml b/jjb/device-management.yaml
index aa8014f..b4eb61b 100644
--- a/jjb/device-management.yaml
+++ b/jjb/device-management.yaml
@@ -13,7 +13,7 @@
           testvm: 'tucson-pod'
           config-pod: 'tucson-pod'
           branch: 'master'
-          oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
+          oltDebVersion: 'openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb'
           profile: 'Default'
           time-trigger: "@daily"
 
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 4445543..ed32c7f 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -21,7 +21,7 @@
           build-node: 'omec-qa'
           c3po-branch-name: 'multiUpfs'
           ngic-branch-name: 'central-cp-multi-upfs'
-          openmme-branch-name: 'paging'
+          openmme-branch-name: 'master'
           pipeline-file: 'omec-postmerge.groovy'
 
 # for ngic-rtc
@@ -115,7 +115,7 @@
           mme-repo: 'openmme'
       - 'omec-install':
           sub-project: '{name}'
-          branch: 'paging'
+          branch: 'master'
           pipeline-file: 'Jenkinsfile-omec-install-openmme-vnf.groovy'
       - 'omec-fossa':
           pipeline-file: 'omec-fossa-scan.groovy'
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index b943573..ba236dd 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -269,6 +269,11 @@
               olt_sw_present = sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --list | grep asfvolt16 | wc -l'"
               return olt_sw_present.toInteger() == 0
             }
+            if ( params.branch == 'voltha-2.3' ) {
+              oltDebVersion = oltDebVersionVoltha23
+            } else {
+              oltDebVersion = oltDebVersionMaster
+            }
             sh returnStdout: false, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --install ${oltDebVersion}'"
             waitUntil {
               olt_sw_present = sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --list | grep asfvolt16 | wc -l'"
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 4d4ad98..a89f908 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -89,24 +89,6 @@
           time-trigger: "H H/6 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-scale-test'
-          build-node: 'qct-pod4-node2'
-          code-branch: 'master'
-          make-target: scale-multi-kind
-          onus: 2
-          pons: 8
-          time-trigger: "H H/6 * * *"
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-scale-test-2.3'
-          build-node: 'qct-pod4-node2'
-          code-branch: 'voltha-2.3'
-          make-target: scale-multi-kind
-          onus: 2
-          pons: 8
-          time-trigger: "H H/6 * * *"
-
-      - 'voltha-periodic-test':
           name: 'periodic-voltha-alarm-test'
           build-node: 'qct-pod4-node2'
           code-branch: 'master'
@@ -139,7 +121,8 @@
           name: 'verify_physical_voltha_patchset_auto'
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
-          oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
+          oltDebVersionMaster: 'openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb'
           profile: 'Default'
 
       # Per-patchset Pod builds on Tucson pod
@@ -147,7 +130,8 @@
           name: 'verify_physical_voltha_patchset_manual'
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
-          oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
+          oltDebVersionMaster: 'openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb'
           profile: 'Default'
 
       # Manual build job for Tucson pod
@@ -157,7 +141,8 @@
           build-node: 'tucson-pod'
           config-pod: 'tucson-pod'
           manualBranch: 'master'
-          oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
+          oltDebVersionMaster: 'openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb'
+          oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb'
           profile: 'Default'
 
 - job-template:
@@ -421,9 +406,14 @@
           description: 'A repository containing the config files, will be checked out if specified'
 
       - string:
+          name: oltDebVersionMaster
+          default: '{oltDebVersionMaster}'
+          description: 'OLT Software version to install for master branch builds'
+
+      - string:
           name: oltDebVersion
-          default: '{oltDebVersion}'
-          description: 'OLT Software version to install'
+          default: '{oltDebVersionVoltha23}'
+          description: 'OLT Software version to install for voltha-2.3 branch builds'
 
       - string:
           name: profile
@@ -558,9 +548,14 @@
           description: 'A repository containing the config files, will be checked out if specified'
 
       - string:
-          name: oltDebVersion
-          default: '{oltDebVersion}'
-          description: 'OLT Software version to install'
+          name: oltDebVersionMaster
+          default: '{oltDebVersionMaster}'
+          description: 'OLT Software version to install for master branch builds'
+
+      - string:
+          name: oltDebVersionVoltha23
+          default: '{oltDebVersionVoltha23}'
+          description: 'OLT Software version to install for voltha-2.3 branch builds'
 
       - string:
           name: profile
@@ -696,9 +691,14 @@
           description: 'A repository containing the config files, will be checked out if specified'
 
       - string:
-          name: oltDebVersion
-          default: '{oltDebVersion}'
-          description: 'OLT Software version to install'
+          name: oltDebVersionMaster
+          default: '{oltDebVersionMaster}'
+          description: 'OLT Software version to install for master branch builds'
+
+      - string:
+          name: oltDebVersionVoltha23
+          default: '{oltDebVersionVoltha23}'
+          description: 'OLT Software version to install for voltha-2.3 branch builds'
 
       - string:
           name: profile