diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index f819d1f..0a92aad 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -93,6 +93,16 @@
           default: '{num-of-onos}'
           description: 'Installs the specified Number of ONOS instances'
 
+      - bool:
+          name: enableMultiUni
+          default: '{enableMultiUni}'
+          description: "Enables the Multi UNI feature"
+
+      - string:
+          name: uniPortMask
+          default: '{uniPortMask}'
+          description: 'Open ONU adapter uni_port_mask, used when enableMultiUni is set to True, values: 0x0001-0x00FF'
+
       # installBBSim is not used in the master branch pipeline, remove after 2.8
       - bool:
           name: installBBSim
@@ -224,6 +234,8 @@
     volthaHelmChartsChange: ''
     profile: 'Default'
     logLevel: 'DEBUG'
+    enableMultiUni: false
+    uniPortMask: '0x0001'
     # installBBSim is not used in the master branch pipeline, remove after 2.8
     installBBSim: false
     bbsimReplicas: 0
@@ -265,6 +277,8 @@
     volthaHelmChartsChange: ''
     profile: 'Default'
     logLevel: 'DEBUG'
+    enableMultiUni: false
+    uniPortMask: '0x0001'
     # installBBSim is not used in the master branch pipeline, remove after 2.8
     installBBSim: false
     bbsimReplicas: 0
@@ -301,6 +315,8 @@
     branch: 'voltha-2.7'
     volthaHelmChartsChange: '' # this is not supported in the VOLTHA-2.7 build, but the parameters are shared, ideally we should split them
     logLevel: 'DEBUG'
+    enableMultiUni: false
+    uniPortMask: '0x0001'
     installBBSim: false
     # bbsimReplicas is not applicable for 2.7 Jobs
     bbsimReplicas: 0
@@ -345,6 +361,7 @@
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
+    enableMultiUni: false
 
     parameters:
       - string:
@@ -413,6 +430,11 @@
           description: 'Installs and uses the specified work flow on the POD'
 
       - bool:
+          name: enableMultiUni
+          default: '{enableMultiUni}'
+          description: "Enables the Multi UNI feature"
+
+      - bool:
           name: powerSwitch
           default: '{power-switch}'
           description: "Indicate whether POD has power switch to reboot ONUs/OLT remotely"
@@ -590,6 +612,7 @@
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
+    enableMultiUni: false
 
     parameters:
       - string:
@@ -662,6 +685,11 @@
           default: '{power-switch}'
           description: "Indicate whether POD has power switch to reboot ONUs/OLT remotely"
 
+      - bool:
+          name: enableMultiUni
+          default: '{enableMultiUni}'
+          description: "Enables the Multi UNI feature"
+
       - string:
           name: oltAdapterAppLabel
           default: '{oltAdapterAppLabel}'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 993b33a..8144d4b 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -76,7 +76,7 @@
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           profile: 'Default'
-          time: '4'
+          time: '5'
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
@@ -121,6 +121,7 @@
       - 'build_voltha_pod_release_legacy':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
+          disable-job: true
           release: '2.7'
           branch: 'voltha-2.7'
           num-of-openonu: '1'
@@ -132,13 +133,15 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: 'TP'
-          time: '22'
+          # Update this value while enabling the job
+          time: ''
           VolthaEtcdPort: 9999
 
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
+          disable-job: true
           release: '2.7'
           branch: 'voltha-2.7'
           name-extension: '_TT'
@@ -157,7 +160,7 @@
           name-extension: '_TT'
           work-flow: 'TT'
           profile: 'TP'
-          time: '9'
+          time: '10'
           VolthaEtcdPort: 9999
           num-of-onos: '3'
           num-of-atomix: '3'
@@ -175,6 +178,37 @@
           test-repo: 'voltha-system-tests'
           profile: 'TP'
 
+    # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-multi-uni'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '15'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          reinstall-olt: true
+          enableMultiUni: true
+          uniPortMask: '0x0003'
+
+      # flex pod1 test job - released versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-multi-uni'
+          release: 'master'
+          branch: 'master'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: True
+          pipeline-script: 'voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+          enableMultiUni: true
+
       # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'menlo-demo-pod'