diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index d8e48ea..5f6d7f3 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -74,6 +74,7 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -86,6 +87,7 @@
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -98,6 +100,7 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -110,6 +113,7 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
+        uni_id: 1
   
     dst:
       -
diff --git a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
index 98b9851..8776521 100644
--- a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
@@ -72,6 +72,7 @@
         c_tag: 7
         s_tag: 35
         power_switch_port: 1
+        uni_id: 1
       -
         ip: 10.34.90.41
         user: community
@@ -84,6 +85,7 @@
         c_tag: 7
         s_tag: 36
         power_switch_port: 2
+        uni_id: 1
       -
         ip: 10.34.90.41
         user: community
@@ -96,6 +98,7 @@
         c_tag: 7
         s_tag: 37
         power_switch_port: 3
+        uni_id: 1
 
       -
         ip: 10.34.90.40
@@ -109,6 +112,7 @@
         c_tag: 7
         s_tag: 38
         power_switch_port: 8
+        uni_id: 1
 
     dst:
       -
diff --git a/deployment-configs/dt-berlin-pod-kubespray.yaml b/deployment-configs/dt-berlin-pod-kubespray.yaml
index b61bedd..fc1360c 100644
--- a/deployment-configs/dt-berlin-pod-kubespray.yaml
+++ b/deployment-configs/dt-berlin-pod-kubespray.yaml
@@ -83,6 +83,7 @@
       onu: ALPHe3d1cf5c
       c_tag: 11
       s_tag: 11
+      uni_id: 1
     #GPON ONU
     # -
     #   ip: 127.0.0.1
diff --git a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
index 3d07304..b71a9b4 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
@@ -86,6 +86,7 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -98,6 +99,7 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -110,6 +112,7 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
+        uni_id: 1
 
         #XGSPON ONU
       -
@@ -124,6 +127,7 @@
         c_tag: 7
         s_tag: 12
         power_switch_port: 6
+        uni_id: 1
       -
         ip: 127.0.0.1
         user: community
@@ -136,6 +140,7 @@
         c_tag: 7
         s_tag: 11
         power_switch_port: 8
+        uni_id: 1
 
     dst:
       -
diff --git a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
index d8e48ea..5f6d7f3 100644
--- a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
@@ -74,6 +74,7 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -86,6 +87,7 @@
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -98,6 +100,7 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
+        uni_id: 1
       -
         ip: 10.34.90.42
         user: community
@@ -110,6 +113,7 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
+        uni_id: 1
   
     dst:
       -
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index cad8c9d..8525582 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -75,6 +75,7 @@
       c_tag: 11
       s_tag: 11
       power_switch_port: 6
+      uni_id: 1
     -
       ip: 127.0.0.1
       user: community
@@ -87,6 +88,7 @@
       c_tag: 7
       s_tag: 11
       power_switch_port: 8
+      uni_id: 1
 
   dst:
     -
diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 2489256..40aa307 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -73,6 +73,7 @@
       power_switch_port: 1
       onu_type: 'alpha'
       service_type: 'hsia'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -87,6 +88,7 @@
       power_switch_port: 2
       onu_type: 'alpha'
       service_type: 'hsia'
+      uni_id: '1'
     -
       ip: '10.90.0.221'
       user: 'cord'
@@ -101,6 +103,7 @@
       power_switch_port: 1
       onu_type: ''
       service_type: 'voip'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -115,6 +118,7 @@
       power_switch_port: 2
       onu_type: ''
       service_type: 'voip'
+      uni_id: '1'
     -
       ip: '10.90.0.221'
       user: 'cord'
@@ -129,6 +133,7 @@
       power_switch_port: 1
       onu_type: ''
       service_type: 'vod'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -143,6 +148,7 @@
       power_switch_port: 2
       onu_type: ''
       service_type: 'vod'
+      uni_id: '1'
     -
       ip: '10.90.0.221'
       user: 'cord'
@@ -159,6 +165,7 @@
       mcast_rg: '10.11.6.3/24'
       mcast_grp_subnet_mask: '224.0.0.0/4'
       service_type: 'mcast'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
new file mode 100644
index 0000000..bac4c93
--- /dev/null
+++ b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
@@ -0,0 +1,337 @@
+# Copyright 2021-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
+
+---
+
+kube_config: 'flex-ocp-cord-voltha-master.conf'
+
+nodes:
+  -
+    ip: '10.90.0.221'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.90.0.222'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.90.0.223'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:5b:6d:a8'
+    ip: '10.90.0.224'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '31'
+    device_id: 'of:0000000000000001'
+
+olts:
+  -
+    ip: '10.90.0.225'
+    sship: '10.90.0.225'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    aggPort: '1'
+    serial: 'EC1838000853'
+    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+
+onus:
+  -
+    serial: 'ALPHe3d1cfa7'
+
+hosts:
+  src:
+    -
+      ip: '10.90.0.221'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '801'
+      s_tag: '111'
+      power_switch_port: 1
+      onu_type: 'alpha'
+      service_type: 'hsia'
+      uni_id: '1'
+    -
+      ip: '10.90.0.222'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '101'
+      s_tag: '222'
+      power_switch_port: 2
+      onu_type: 'alpha'
+      service_type: 'hsia'
+      uni_id: '1'
+    -
+      ip: '10.90.0.222'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.35'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7-2
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '102'
+      s_tag: '222'
+      power_switch_port: 2
+      onu_type: 'alpha'
+      service_type: 'hsia'
+      uni_id: '2'
+    -
+      ip: '10.90.0.221'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '444'
+      s_tag: '333'
+      power_switch_port: 1
+      onu_type: ''
+      service_type: 'voip'
+      uni_id: '1'
+    -
+      ip: '10.90.0.222'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '444'
+      s_tag: '333'
+      power_switch_port: 2
+      onu_type: ''
+      service_type: 'voip'
+      uni_id: '1'
+    -
+      ip: '10.90.0.222'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.65'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7-2
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '444'
+      s_tag: '333'
+      power_switch_port: 2
+      onu_type: ''
+      service_type: 'voip'
+      uni_id: '2'
+    -
+      ip: '10.90.0.221'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '555'
+      power_switch_port: 1
+      onu_type: ''
+      service_type: 'vod'
+      uni_id: '1'
+    -
+      ip: '10.90.0.222'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '555'
+      power_switch_port: 2
+      onu_type: ''
+      service_type: 'vod'
+      uni_id: '1'
+    -
+      ip: '10.90.0.222'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1ceb7-2
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '555'
+      power_switch_port: 2
+      onu_type: ''
+      service_type: 'vod'
+      uni_id: '2'
+    -
+      ip: '10.90.0.221'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'eth1.55'
+      container_type: LXC
+      container_name: ALPHe3d1cea3
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '550'
+      power_switch_port: 1
+      onu_type: ''
+      mcast_rg: '10.11.6.3/24'
+      mcast_grp_subnet_mask: '224.0.0.0/4'
+      service_type: 'mcast'
+      uni_id: '1'
+  dst:
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.1.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.90.0.223'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f1
+      dp_iface_ip_qinq: '10.11.2.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.90.0.223'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f1
+      dp_iface_ip_qinq: '10.11.3.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.4.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.90.0.223'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f1
+      dp_iface_ip_qinq: '10.11.4.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.90.0.223'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f1
+      dp_iface_ip_qinq: '10.11.4.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.90.0.223'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f1
+      dp_iface_ip_qinq: '10.11.5.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.5.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.5.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      bng_ip: '10.90.0.223'
+      bng_user: cord
+      bng_pass: cord
+      dp_iface_name: null
+      dp_iface_ip_qinq: '225.22.0.2'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+web_power_switch:
+  ip: '10.90.0.229'
+  user: 'cord'
+  password: 'cord'
+  type: 'DLI'
diff --git a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
index 2489256..40aa307 100644
--- a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
@@ -73,6 +73,7 @@
       power_switch_port: 1
       onu_type: 'alpha'
       service_type: 'hsia'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -87,6 +88,7 @@
       power_switch_port: 2
       onu_type: 'alpha'
       service_type: 'hsia'
+      uni_id: '1'
     -
       ip: '10.90.0.221'
       user: 'cord'
@@ -101,6 +103,7 @@
       power_switch_port: 1
       onu_type: ''
       service_type: 'voip'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -115,6 +118,7 @@
       power_switch_port: 2
       onu_type: ''
       service_type: 'voip'
+      uni_id: '1'
     -
       ip: '10.90.0.221'
       user: 'cord'
@@ -129,6 +133,7 @@
       power_switch_port: 1
       onu_type: ''
       service_type: 'vod'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -143,6 +148,7 @@
       power_switch_port: 2
       onu_type: ''
       service_type: 'vod'
+      uni_id: '1'
     -
       ip: '10.90.0.221'
       user: 'cord'
@@ -159,6 +165,7 @@
       mcast_rg: '10.11.6.3/24'
       mcast_grp_subnet_mask: '224.0.0.0/4'
       service_type: 'mcast'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/flex-ocp-cord-openonupy.yaml b/deployment-configs/flex-ocp-cord-openonupy.yaml
index e96bcd4..d8fcaeb 100644
--- a/deployment-configs/flex-ocp-cord-openonupy.yaml
+++ b/deployment-configs/flex-ocp-cord-openonupy.yaml
@@ -72,6 +72,7 @@
       s_tag: '111'
       power_switch_port: 1
       onu_type: 'alpha'
+      uni_id: '1'
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -85,6 +86,7 @@
       s_tag: '222'
       power_switch_port: 2
       onu_type: 'alpha'
+      uni_id: '1'
 
   dst:
     -
diff --git a/deployment-configs/flex-ocp-cord-voltha-master.yaml b/deployment-configs/flex-ocp-cord-voltha-master.yaml
index af2f4f4..853e2cc 100644
--- a/deployment-configs/flex-ocp-cord-voltha-master.yaml
+++ b/deployment-configs/flex-ocp-cord-voltha-master.yaml
@@ -63,6 +63,7 @@
       c_tag: '999'
       s_tag: '111'
       onu_type: 'alpha'
+      uni_id: '1'
 
   dst:
     -
diff --git a/deployment-configs/flex-ocp-cord-voltha16.yaml b/deployment-configs/flex-ocp-cord-voltha16.yaml
index 9e32aa3..d1d98d4 100644
--- a/deployment-configs/flex-ocp-cord-voltha16.yaml
+++ b/deployment-configs/flex-ocp-cord-voltha16.yaml
@@ -54,6 +54,7 @@
     dp_iface_name: 'ens2f1'
     dp_iface_ip: '10.8.2.1'
     dp_iface_gateway: '10.8.2.254'
+    uni_id: '1'
   dst:
     ip: '10.192.20.198'
     user: 'cord'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index e96bcd4..f34e5df 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -72,6 +72,7 @@
       s_tag: '111'
       power_switch_port: 1
       onu_type: 'alpha'
+      uni_id: 1
     -
       ip: '10.90.0.222'
       user: 'cord'
@@ -85,6 +86,7 @@
       s_tag: '222'
       power_switch_port: 2
       onu_type: 'alpha'
+      uni_id: 1
 
   dst:
     -
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index 98e8139..f4b426c 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -63,6 +63,7 @@
       c_tag: '222'
       s_tag: '111'
       onu_type: 'iskratel'
+      uni_id: '1'
 
   dst:
     -
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
index d8e7e3d..133f0f2 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
@@ -71,6 +71,7 @@
         c_tag: 111
         s_tag: 11
         power_switch_port: 2
+        uni_id: 1
       -
         ip: 10.90.0.240
         user: cord
@@ -83,6 +84,7 @@
         c_tag: 222
         s_tag: 22
         power_switch_port: 4
+        uni_id: 1
 
       -
         ip: 10.90.0.240
@@ -96,6 +98,7 @@
         c_tag: 333
         s_tag: 33
         power_switch_port: 8
+        uni_id: 1
 
       - ip: 10.90.0.240
         user: cord
@@ -108,6 +111,7 @@
         c_tag: 41
         s_tag: 54
         power_switch_port: 6
+        uni_id: 1
 
       - ip: 10.90.0.240
         user: cord
@@ -120,6 +124,7 @@
         c_tag: 42
         s_tag: 55
         power_switch_port: 5
+        uni_id: 1
 
     dst:
       -
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
index f2c7fc5..ec72d78 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
@@ -71,6 +71,7 @@
         c_tag: 41
         s_tag: 44
         power_switch_port: 6
+        uni_id: 1
 
       - ip: 10.90.0.240
         user: cord
@@ -83,6 +84,7 @@
         c_tag: 42
         s_tag: 44
         power_switch_port: 5
+        uni_id: 1
 
     dst:
 
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 94dc696..f5bcf3f 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -75,6 +75,7 @@
       s_tag: '11'
       power_switch_port: 6
       onu_type: 'iskratel'
+      uni_id: '1'
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -88,6 +89,7 @@
       s_tag: '22'
       power_switch_port: 1
       onu_type: 'alpha'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index dc6bee5..467fb62 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -68,6 +68,7 @@
         c_tag: 7
         s_tag: 31
         onu_type: 'scom'
+        uni_id: 1
 
     dst:
       -
diff --git a/deployment-configs/onf-demo-pod-openonugo.yaml b/deployment-configs/onf-demo-pod-openonugo.yaml
index a535669..5153b95 100644
--- a/deployment-configs/onf-demo-pod-openonugo.yaml
+++ b/deployment-configs/onf-demo-pod-openonugo.yaml
@@ -75,6 +75,7 @@
       s_tag: '99'
       power_switch_port: 6
       onu_type: 'iskratel'
+      uni_id: '1'
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -88,6 +89,7 @@
       s_tag: '99'
       power_switch_port: 1
       onu_type: 'alpha'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index a535669..5153b95 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -75,6 +75,7 @@
       s_tag: '99'
       power_switch_port: 6
       onu_type: 'iskratel'
+      uni_id: '1'
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -88,6 +89,7 @@
       s_tag: '99'
       power_switch_port: 1
       onu_type: 'alpha'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 8462c69..f010c29 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -71,6 +71,7 @@
       olt: 'EC1721000208'
       c_tag: '11'
       s_tag: '222'
+      uni_id: '1'
     -
       ip: '10.128.90.90'
       user: 'cord'
@@ -83,6 +84,7 @@
       olt: 'EC1721000208'
       c_tag: '12'
       s_tag: '111'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index 8a25a19..0cca982 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -65,6 +65,7 @@
       olt: 'EC1721000208'
       c_tag: '11'
       s_tag: '222'
+      uni_id: '1'
     -
       ip: '10.128.90.90'
       user: 'cord'
@@ -77,6 +78,7 @@
       olt: 'EC1721000208'
       c_tag: '12'
       s_tag: '111'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index 8a25a19..0cca982 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -65,6 +65,7 @@
       olt: 'EC1721000208'
       c_tag: '11'
       s_tag: '222'
+      uni_id: '1'
     -
       ip: '10.128.90.90'
       user: 'cord'
@@ -77,6 +78,7 @@
       olt: 'EC1721000208'
       c_tag: '12'
       s_tag: '111'
+      uni_id: '1'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onlab-pod1-qa.yaml b/deployment-configs/onlab-pod1-qa.yaml
index f4d40de..1aa1075 100644
--- a/deployment-configs/onlab-pod1-qa.yaml
+++ b/deployment-configs/onlab-pod1-qa.yaml
@@ -72,6 +72,7 @@
       c_tag: '112'
       s_tag: '111'
       onu_type: 'alpha'
+      uni_id: '1'
 
     -
       ip: '10.90.0.51'
@@ -84,6 +85,7 @@
       c_tag: '113'
       s_tag: '111'
       onu_type: 'iskratel'
+      uni_id: '1'
     -
       ip: '10.90.0.51'
       user: 'ubuntu'
@@ -95,6 +97,7 @@
       c_tag: '114'
       s_tag: '110'
       onu_type: 'brcm'
+      uni_id: '1'
 
   dst:
     -
diff --git a/deployment-configs/onlab-pod1-voltha16.yaml b/deployment-configs/onlab-pod1-voltha16.yaml
index 4eece97..b42d174 100644
--- a/deployment-configs/onlab-pod1-voltha16.yaml
+++ b/deployment-configs/onlab-pod1-voltha16.yaml
@@ -66,5 +66,6 @@
     dp_iface_name: 'eth1'
     container_type: 'LXC'
     container_name: 'ALPHe3d1cfde'
+    uni_id: '1'
   dst:
     dp_iface_ip_qinq: '8.8.8.8'
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 5cc5440..095424e 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -78,6 +78,7 @@
       c_tag: '112'
       s_tag: '111'
       onu_type: 'alpha'
+      uni_id: '1'
 
   dst:
     -
diff --git a/deployment-configs/onlab-pod2.yaml b/deployment-configs/onlab-pod2.yaml
index c4dbc76..960950a 100644
--- a/deployment-configs/onlab-pod2.yaml
+++ b/deployment-configs/onlab-pod2.yaml
@@ -56,5 +56,6 @@
     dp_iface_name: 'eth1'
     container_type: 'LXC'
     container_name: 'ALPHe3d1cfe3'
+    uni_id: '1'
   dst:
-    dp_iface_ip_qinq: '8.8.8.8'
\ No newline at end of file
+    dp_iface_ip_qinq: '8.8.8.8'
diff --git a/deployment-configs/tucson-pod-DT.yaml b/deployment-configs/tucson-pod-DT.yaml
index e56a30f..c137f7a 100644
--- a/deployment-configs/tucson-pod-DT.yaml
+++ b/deployment-configs/tucson-pod-DT.yaml
@@ -55,6 +55,7 @@
       s_tag: 11
       onu_type: 'alpha'
       power_switch_port: 2
+      uni_id: 1
     -
       ip: 127.0.0.1
       user: cord
@@ -68,6 +69,7 @@
       s_tag: 22
       onu_type: 'iskratel'
       power_switch_port: 3
+      uni_id: 1
     -
       ip: 127.0.0.1
       user: cord
@@ -81,6 +83,7 @@
       s_tag: 21
       onu_type: 'alpha'
       power_switch_port: 4
+      uni_id: 1
 
   dst:
     -
diff --git a/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index 2090749..74dff16 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -55,6 +55,7 @@
       s_tag: 11
       onu_type: 'alpha'
       power_switch_port: 2
+      uni_id: 1
     -
       ip: 127.0.0.1
       user: cord
@@ -68,6 +69,7 @@
       s_tag: 11
       onu_type: 'iskratel'
       power_switch_port: 3
+      uni_id: 1
     -
       ip: 127.0.0.1
       user: cord
@@ -81,6 +83,7 @@
       s_tag: 21
       onu_type: 'alpha'
       power_switch_port: 4
+      uni_id: 1
 
   dst:
     -
diff --git a/kubernetes-configs/flex-ocp-cord-multi-uni.conf b/kubernetes-configs/flex-ocp-cord-multi-uni.conf
new file mode 100644
index 0000000..bda1246
--- /dev/null
+++ b/kubernetes-configs/flex-ocp-cord-multi-uni.conf
@@ -0,0 +1,39 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "onf-flex-pod"
+  cluster:
+    server: "https://10.90.0.221:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl4TURJeU5ERTNNall5TVZvWERUTXhNREl5TWpFM01qWXlNVm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU85R1JBK2JmQVoyCldtNEt0UDE0ODlBb1FKTW5vMzdtTmowaXFVcGlybU0zTXVJUklTRXk4c\
+      2h1cnhUTlRla2ZYU3d1UDNwdVRlZmIKeGh3ZG9WcDlXby9RZnB3WHg3UkIxajdYK25STmY3eE90b\
+      zlEVWd4Z1hQbFFZTmwvTFdxejBONWRmS1YzaXJvcQp2WVVpeVFhOWdWeUFXZGVYREZBWWhXMzg4b\
+      i96OUx0eUs0bWdzd1lPeVphSXNsSGNFWjdheXYzTmtvNzZRL1JjCk5RVXVRaUNlaWhGSEIxNSttb\
+      EFrR1FraUkxRUpCZWFQY0lqTXVOSU9hcUQ2R3krTUQxaFJFcWNwTUtXVEgxc0YKMi9LMTRsYXhKW\
+      GE0RWkzZ0N3SDJCaWVHVWNvZ1ZyNFNROHZReU05alYyL2RnQllzR09aVVM5ZHB5ZzVVUjZpMgpTR\
+      lpWTTVoZmFhMENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBTHBIc2o5azVjVVlCSDg2aGlJTHpKL\
+      1BzRUZoUmgyMXJCRUUKUFRvQ2RGaldpL3NkMWhlVWtwL2VTTzRWa1IzUklCMkhDWEovSzFrR0xSd\
+      3BUV1NBZ0RsbW9WVWZnU3JCVHZ4aQplQ3EzNmo2OGtpZUNydEgyR2RsRm9EbUR4MmJpaWg2MGZEZ\
+      U5NTU15WE9Ed3RoZWtaR28wdHhHQmRTNjBQbEdNCkQ0bys3eTJ1UzIxZVNiSEYrN0ZVeHhQQk83R\
+      DFLOGYrYTdpNWx2VExMYmplUVNNVFJWVkN5ZmVBYUFoRWFnUUEKd0J3QVhpNW9TS21vVWlOc0ZCV\
+      FNwTVRaZGpXdHhsMHhsRTRhaDJYaUZzUTF6WWpIK29mSllnRmkzQ1ZoU3UvVQpDdHU1eUtjVFdaT\
+      zA3Sk9zamtiWTRNb2piaklCaUpOelpGaEI2dGI4YkRNTFdSR1MxMmc9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
+users:
+- name: "onf-flex-pod"
+  user:
+    token: "kubeconfig-user-cvpsj.c-bqnq8:r5zxqhf8cwqs6pqlt2k82xjngqkcpslwk2glmlzqf42d6hmctl879q"
+
+contexts:
+- name: "onf-flex-pod"
+  context:
+    user: "onf-flex-pod"
+    cluster: "onf-flex-pod"
+
+current-context: "onf-flex-pod"
+