diff --git a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml b/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
index 38b0daf..79c9412 100644
--- a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
+++ b/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
@@ -5,6 +5,8 @@
   central: false
   edge: true
 
+onos:
+  fullnameOverride: "cord-platform-onos"
 kafka:
   fullnameOverride: "cord-platform-kafka"
 
diff --git a/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml b/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
index 3662c68..8e8a621 100644
--- a/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
+++ b/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
@@ -2,5 +2,7 @@
   sriov:
     resourceList:
       vfio:
-        pfNames:
-          - eth2
+        s1uPfNames:
+          - eth2#0-3
+        sgiPfNames:
+          - eth2#4-7
diff --git a/deployment-configs/aether/apps/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global-nem-monitoring.yaml
index 2f7ca98..9bc6472 100644
--- a/deployment-configs/aether/apps/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global-nem-monitoring.yaml
@@ -28,7 +28,6 @@
             - targets:
               - cord-platform-prometheus-server.cord-platform-p-s5pp8.svc.product.central:80
               - cord-platform-prometheus-server.cord-platform-p-6lcrm.svc.menlo.edge:80
-              - cord-platform-prometheus-server.cord-platform-p-lmx6j.svc.b.staging.edge:80
   extraScrapeConfigs: ""
 
 grafana:
diff --git a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/production-accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/production-accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml b/deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml
new file mode 100644
index 0000000..11b6e93
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml
@@ -0,0 +1,7 @@
+config:
+  mme:
+    ip: "10.168.0.204"
+  vranL3:
+    plmnId: "130501"
+    instanceId: "onfcell202"
+    tac: 202
diff --git a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml
deleted file mode 100644
index 8cae075..0000000
--- a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-config:
-  mme:
-    ip: "10.168.0.204"
diff --git a/deployment-configs/aether/apps/production-omec-cp.yaml b/deployment-configs/aether/apps/production-omec-cp.yaml
index 6e5f4a9..7262df9 100644
--- a/deployment-configs/aether/apps/production-omec-cp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp.yaml
@@ -15,32 +15,52 @@
 config:
   clusterDomain: "product.central"
   spgwc:
+    apn: internet
+    multiUpfs: true
     s1uAddr: "119.0.0.7"
   mme:
     cfgFiles:
       config.json:
         mme:
           mcc:
-            dig1: 7
-            dig2: 3
-            dig3: 2
+            dig1: 3
+            dig2: 1
+            dig3: 5
           mnc:
             dig1: 1
-            dig2: 1
-            dig3: 1
+            dig2: 0
+            dig3: 0
   hss:
     acl:
       oldTls: "*.product.central"
     bootstrap:
       enabled: true
       users:
-        - imsi: "732111000000420"
+        - imsi: "315010999912345"
           msisdn: "1122334455"
           apn: "apn1"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
-        - imsi: "732111000000421"
+        - imsi: "315010999912346"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912347"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912348"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912349"
           msisdn: "1122334455"
           apn: "apn1"
           key: "000102030405060708090a0b0c0d0e0f"
diff --git a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
similarity index 75%
rename from deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
rename to deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
index 6f2ba16..5e90e65 100644
--- a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
@@ -1,10 +1,11 @@
 images:
   tags:
-    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0-debug"
+    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
   pullPolicy: "Always"
 
 config:
   spgwu:
+    multiUpfs: true
     cpComm:
       addr: "spgwc-headless.omec.svc.product.central"
     s1u:
@@ -15,7 +16,8 @@
       device: "sgi-net"
       # NOTE: set different IP for each edge
       ip: "13.1.1.7/24"
+    dpName: "dp1"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.30"
diff --git a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-a.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-a.yaml
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml
new file mode 100644
index 0000000..6e0f6ab
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml
@@ -0,0 +1,3 @@
+config:
+  nats:
+    ip: "119.0.0.21"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml
new file mode 100644
index 0000000..dd7b786
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml
@@ -0,0 +1,3 @@
+config:
+  nats:
+    ip: "119.0.0.22"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml
new file mode 100644
index 0000000..49c6ad8
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml
@@ -0,0 +1,3 @@
+config:
+  nats:
+    ip: "119.0.0.42"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml
new file mode 100644
index 0000000..749442b
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml
@@ -0,0 +1,7 @@
+config:
+  mme:
+    ip: "10.168.0.192"
+  vranL3:
+    plmnId: "130501"
+    instanceId: "onfcell203"
+    tac: 203
diff --git a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
deleted file mode 100644
index b048ac6..0000000
--- a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-config:
-  mme:
-    ip: "10.168.0.192"
diff --git a/deployment-configs/aether/apps/staging-omec-cp.yaml b/deployment-configs/aether/apps/staging-omec-cp.yaml
index 210c393..6386972 100644
--- a/deployment-configs/aether/apps/staging-omec-cp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-cp.yaml
@@ -14,35 +14,54 @@
 
 config:
   clusterDomain: "staging.central"
-  hss:
-    hssdb: cassandra
   spgwc:
+    apn: internet
+    multiUpfs: true
+    # can be any IP address, not used but crash without it
     s1uAddr: "119.0.0.3"
   mme:
     cfgFiles:
       config.json:
         mme:
           mcc:
-            dig1: 7
-            dig2: 3
-            dig3: 2
+            dig1: 3
+            dig2: 1
+            dig3: 5
           mnc:
             dig1: 1
-            dig2: 1
-            dig3: 1
+            dig2: 0
+            dig3: 0
   hss:
     acl:
       oldTls: "*.staging.central"
     bootstrap:
       enabled: true
       users:
-        - imsi: "732111000000420"
+        - imsi: "315010999912345"
           msisdn: "1122334455"
           apn: "apn1"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
-        - imsi: "732111000000421"
+        - imsi: "315010999912346"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912347"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912348"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912349"
           msisdn: "1122334455"
           apn: "apn1"
           key: "000102030405060708090a0b0c0d0e0f"
diff --git a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
similarity index 81%
rename from deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
rename to deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
index 29410c4..dfab493 100644
--- a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
@@ -5,6 +5,7 @@
 
 config:
   spgwu:
+    multiUpfs: true
     cpComm:
       addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
@@ -13,6 +14,7 @@
     sgi:
       device: "sgi-net"
       ip: "13.1.1.3/24"
+    dpName: "dp-staging-a"
 networks:
   sgi:
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.20"
diff --git a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml
similarity index 68%
copy from deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
copy to deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml
index 29410c4..93de0db 100644
--- a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml
@@ -5,14 +5,16 @@
 
 config:
   spgwu:
+    multiUpfs: true
     cpComm:
       addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
       device: "s1u-net"
-      ip: "119.0.0.3/24"
+      ip: "119.0.0.4/24"
     sgi:
       device: "sgi-net"
-      ip: "13.1.1.3/24"
+      ip: "13.1.1.4/24"
+    dpName: "dp-staging-b"
 networks:
   sgi:
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.21"
diff --git a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml
similarity index 68%
copy from deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
copy to deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml
index 29410c4..290b91e 100644
--- a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml
@@ -5,14 +5,16 @@
 
 config:
   spgwu:
+    multiUpfs: true
     cpComm:
       addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
       device: "s1u-net"
-      ip: "119.0.0.3/24"
+      ip: "119.0.0.5/24"
     sgi:
       device: "sgi-net"
-      ip: "13.1.1.3/24"
+      ip: "13.1.1.5/24"
+    dpName: "dp-staging-c"
 networks:
   sgi:
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.22"
diff --git a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
similarity index 69%
copy from deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
copy to deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
index 29410c4..14a96af 100644
--- a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
@@ -5,14 +5,16 @@
 
 config:
   spgwu:
+    multiUpfs: true
     cpComm:
       addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
       device: "s1u-net"
-      ip: "119.0.0.3/24"
+      ip: "119.0.0.43/24"
     sgi:
       device: "sgi-net"
-      ip: "13.1.1.3/24"
+      ip: "13.1.1.43/24"
+    dpName: "dp-nokia"
 networks:
   sgi:
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.42"
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
new file mode 100644
index 0000000..1e712da
--- /dev/null
+++ b/deployment-configs/infosys-pod.yaml
@@ -0,0 +1,72 @@
+# Copyright 2017-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 INFOSYS POD , olt/onu are connected to this
+
+---
+
+kube_config: 'infosys.conf'
+
+nodes:
+  -
+    ip: '192.168.10.1'
+    user: 'infosys'
+    pass: 'Engne@12345'
+
+fabric_switches:
+  -
+    mac: 'b8:6a:97:8b:ef:3c'
+    ip: '192.168.10.3'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '3'
+    oltPort: '10'
+    device_id: 'of:0000000000000001'
+
+olts:
+  -
+    ip: '192.168.10.2'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    serial: 'EC1917000121'
+
+onus:
+  -
+    serial: 'ISKT71e82118'
+
+hosts:
+  src:
+    -
+      ip: '192.168.10.7'
+      user: 'voltharg'
+      pass: 'voltharg'
+      dp_iface_name: 'enp0s3'
+      container_type: null
+      container_name: null
+      onu: 'ISKT71e82118'
+      c_tag: '222'
+      s_tag: '111'
+
+  dst:
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '192.168.20.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
diff --git a/kubernetes-configs/infosys-pod.conf b/kubernetes-configs/infosys-pod.conf
new file mode 100644
index 0000000..94a49b8
--- /dev/null
+++ b/kubernetes-configs/infosys-pod.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ERXhOakV5TlRJeE0xb1hEVE13TURFeE16RXlOVEl4TTFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTitjCmFKaXRQQ2RDRVZidmdYT3phWGpPemJUd3IxR3k1bStIMmI2R1oxUGRVV0tOVFk2a0tjSm8vOVBQUUpKZWN5emcKd3pDVTJITzVpQ255S1c5bC8rS0kvd1Z5RW5wdmVlSGNKc3JNckhuVlFyRG9VbVRBSjhUemlsYjJLc1lpdW95UApBWFExcFNGU3QxWU43OU5VWitoRVRMbU5wWWJrV2lqMXREc1B6Wmg2akROYVAzempKcDhqaW9TTTQ0aVAzclBYClA1MmpYVHFFa0FDR201VjFxb0VEc05uM1lob0UrcmFxd1VOMU5nQmp4L1Iwdy9DUXZKS3hnTXNua28xaEl1U0QKVUxXUFFFMDQyaTNFS0h6QWgyNXJHMnAzRDNoUHpJMis3Vk9oNDJIRTJpcEdQdHF5Tzk0OTZ6UFFiVXRNN2phdgovcllXb2oyakFVZDJhWG5rSTg4Q0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFOZUJCeExVM2dFUFhFaDdlVU1KNGR3Nm5wdDIKU0hZVXR4amIrKzlhZDk0Q25tQndnL0JDdC9peHovdlBocmFYWTFwZlkvVHQya1lVNmxQVkRoVVFNY1ZUSUp5OApoYkQrOW5WUmRGM1JDQmgvNXFjdGo5dVluNVUzaE82U09OWEF6alQ4N2U3RGJtQ1BQUTg5UGRaS1dFT0lLNnd6CjUxUGJqZTFzT0plMGJBdDhBT25PNGNQTllkK2ZHdlRheDBkNFJidEhUcjZUUk04SFZsN1docmxoRGZ2eUZyTksKay9rRGJjSkZKdlkvem9YZWJlcUxaTndyNmFMSUgrbXh6MVNsUWYxMFh4a05qTEthOUhuc0xhbVpENzJsdHFrZApmN2J3ZEl4OEpkS0E5QjBNQnlyNmxlRTFKVHVrQzdYUUFpOExQWVE3ZUhQZ3paZWRHUUNMYTJtOTdzbz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.68.6.182:6443
+  name: kubernetes
+contexts:
+- context:
+    cluster: kubernetes
+    user: kubernetes-admin
+  name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJQ2RrOUcxZEpESlV3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBeE1UWXhNalV5TVROYUZ3MHlNVEF4TVRVeE1qVXlNVFZhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXZvSG5vclR0VmsvbVJlcmMKVEtIZDcxTTVRZVZEMzIwN090bVRtZkhmOElpdDIyb3htWFVGUWR2MXJmMVBSUmZhYjVQd0FuNlZpM0ZSQ0l2dApFd1BQNGFrUlZraXFFdm9JRENvd1Zia1orQ1hkNGhVVEl5bklSd0R1bGVaODBqUm5UVjZzaFdoY0s2WEYxaFluClNBQWhZcWRiSTNuN3RTWkdHbyt3akNYZEdHK0hvRVQ2d1hucms0bUZBUzJORDNyWlk2dkdvd1V5YzZxQ09NMHgKZkx3RldmaXlpdkk1NWlVU1hXUXRYa3M4dzVyVlBvRGZYaGxBbjdYUWNQMk9vR1BBbUl6bDhFSXdkeVluUm5ZUApqOUd2ZE5VTXFpeFc4SjZDSUIxMnlMcXRmRFNBMkxkMmhXMmxBWVA5bHhZY216akV3b2g3ZGwvK09YSHNIWmMzCkR1Uy9Od0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFCZ3RTbnUrRFFBbmlSNFdmeTc2b0dTdTZzRE9QN1F3MGtteQo4TG9jK3dDMlBkeXFnNVh3Q3NTcHFzUS9UaDB2L1VHQVBGUDJQb2FHZEV5Zk5ENjRoRGdkbTAxT1p2UW1BcmdMCndrcmxuOWFKdGUwM2oxc3JSUTdjYXo2enk3K3EyMGxNeFdtdXBSdjBBdGdadVFoVjdSc2Q5VlFORUZvUGVrSlgKd1BSZ3RCVzczRVVtY1E4YVE3RFFPa3FlZkpnTXVseElrY2l5MER0eFpJWm5HUklHdkpmY0NaZXRmUjFQWUtPQQpoVnJ6akx3Vi83K3NOZkVYTHFWZDU2V3huRktMc0RkczY3VDU5cGxQdWdEUnZtTEhQdlpjeG9tbDBYNmZLZUhKCkIvajJ5UGk5WFVuZkJ0QUZlTit1ekdPR2lHeGZ6L3N3RGVXZkVvS0cyd05HZFZRS1JETT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBdm9Ibm9yVHRWay9tUmVyY1RLSGQ3MU01UWVWRDMyMDdPdG1UbWZIZjhJaXQyMm94Cm1YVUZRZHYxcmYxUFJSZmFiNVB3QW42VmkzRlJDSXZ0RXdQUDRha1JWa2lxRXZvSURDb3dWYmtaK0NYZDRoVVQKSXluSVJ3RHVsZVo4MGpSblRWNnNoV2hjSzZYRjFoWW5TQUFoWXFkYkkzbjd0U1pHR28rd2pDWGRHRytIb0VUNgp3WG5yazRtRkFTMk5EM3JaWTZ2R293VXljNnFDT00weGZMd0ZXZml5aXZJNTVpVVNYV1F0WGtzOHc1clZQb0RmClhobEFuN1hRY1AyT29HUEFtSXpsOEVJd2R5WW5SbllQajlHdmROVU1xaXhXOEo2Q0lCMTJ5THF0ZkRTQTJMZDIKaFcybEFZUDlseFljbXpqRXdvaDdkbC8rT1hIc0haYzNEdVMvTndJREFRQUJBb0lCQVFDWXFQYWF6c3Rsb0E5UwpOZHNsV1l6RUxIZTBrMmpwVU5ubTFkWE94aUdDMmJRZ0lKL3diZkt4alBiNTN3UTN4TjZaRFA2R3NUTmJFNG94CkJCZ05aYitmQUdGUk9GZDViMzBsYW1WalBEcFFQTi9xUEtNaVNXZ2haZURLcEhHZjdMaGZLcCtySkM3QUYwNUsKdVdQdThaUFBQM2JzSGVNVGpjRWRwY2wrOVJTUWIrT0RaeC8xWkc3bUx3Nk9nQmVxSjlXUFhvVkFTZGN4Vy9UNgp2b1VhNkJiNFRpR0ZVYzVaUHRCaHBmcEo1MUJvTFdoNUFyNTFraFNyd1BHalJHWUlvd21mYmJacCt0ZEdJeFZLCjJ6SFVubElKLzczYUhmc2lGOE9heDZWRTFCNGxsZ21Md0lCdkx4T3BiZ0E0K1lURGRJOVNPQldIblhuZFNpV1kKV1VvUVI4VzVBb0dCQU1keDYydjMwNW1Gd0JpYk4yNkZTT2ZRcW8wb1dVVEpaTkxFU25namdIWWFZdUc0dnJKegp5aXpDd3BDK0RhczdGU1hyamFNcW10OFY3RGJLU2hIaEVZM3p6RlhFS0I1U1gxT1g5aUtqZHpLVkZrdG1YMDAvCjNXbnlIUDhIbDRhanRRRDJhRUZvY3o1MkNONTV4U1hJcGV6TG5XWERQSVE0NUo3UHFCYTZWZWxOQW9HQkFQU0gKTVAvTmxPTXlnZW9FNmhwQ09wQTNyYlJzTm9wZVNUa0NKUnBiSy9zY28zMW1VSlZaVGJ0OWNMd0JJQmNYSTc3dwpzNGJNK1J1aDJiZjRZVVFIODlRMTFxa2FQL0RFYlovUHFnaXVJaGhXcEpMNTZaRlhQZ1hCZ2FGUlpRcS85OVZsClB3SWJWbmZXWm9jckNPRXhxN3dHT2p3dE1hZUwrdjIxbCtEanF1aVRBb0dCQUlaU21RVnNNVnlTRWVBQW1ZS2IKelpBaW50cldzOWg1OHFkb2YrY05zZlRZcklQdEVySEkvZjdMWkpKckRYV25Jd1VZOFpsVWxsMXN2RnZpUGFSdworb3VxQ0pJeXUvby82K2UyenBSaGwyTy91UFlyQ2tCU3BPSTNwNE96TDBBRWZXRWFrdmlLU2lObEIzQWVmc0tGCnNnb2F6L1M3V3NTS05KOG9wOEkyMktsNUFvR0JBTnNXMGVrdjZrbVNOR0pYMnVTQ0dIU2szbWI4V2ZXcHV0TncKUDR3WXloUW91YmNlVis4b1g0UXdSVFM5a1dIKzRwRXVtcnVacFV5RHZFMmdKbzNNemtPQnBYNUh2YWhjWnBnOAplTzFrRDdwY3p3RzlGdStaQ2tJZithUnZDQ2dVamRwTjU2RmNteUd1SUpqVkR4U3Q2MkFBK0daNFc3ZnhySVZyCkVkUjJSK2d2QW9HQkFNRURudGdvSlJ6Nk5tWUp0T0g5TTJlNFBML3k5SkdXb0g3WUxJZnlPTVVabWFpaGd0V0kKQWlYTVFwdVFpdWdEaHJYK2JwSWJ6OTNCbG91QkM5TnNoY3YxQzVKRHNUbmJCblNieDFqZ2RGU1hmN1BEbllXNgpQdG1CL0RzM0VSMmNOdkJ5ZUhjQmtKNWVreG9HNmhHYjBZcHlzSUNqSWwwOVJtVVNaK0VqSm9XegotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 3a898a7..c63fc45 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -16,6 +16,11 @@
   image_tag: master
   image_pullPolicy: Always
 
+images:
+  onos:
+    repository: voltha/voltha-onos
+    tag: onos-2.2 
+
 deployments:
   etcdOperator: true
   backupOperator: false
diff --git a/kubernetes-configs/voltha/infosys-pod.yml b/kubernetes-configs/voltha/infosys-pod.yml
new file mode 100644
index 0000000..3a898a7
--- /dev/null
+++ b/kubernetes-configs/voltha/infosys-pod.yml
@@ -0,0 +1,41 @@
+# Copyright 2019 Ciena Corporation
+#
+# 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.
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+voltha-etcd-cluster:
+  clusterSize: 1
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base,hostprovider"
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml
new file mode 100644
index 0000000..d634bc2
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml
@@ -0,0 +1,128 @@
+# Copyright 2017-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.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onf-p4-demo-pod-fabric.yaml http://192.168.100.1:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/switch.yaml
+  - custom_types/switchport.yaml
+  - custom_types/portinterface.yaml
+  - custom_types/bngportmapping.yaml
+  - custom_types/fabricipaddress.yaml
+  - custom_types/serviceinstanceattribute.yaml
+  - custom_types/onosapp.yaml
+  - custom_types/servicegraphconstraint.yaml
+  - custom_types/attworkflowdriverwhitelistentry.yaml
+  - custom_types/attworkflowdriverservice.yaml
+
+description: Configures the fabric and the whitelist
+
+topology_template:
+  node_templates:
+
+    # Fabric configuration
+    switch#leaf_1:
+      type: tosca.nodes.Switch
+      properties:
+        driver: ofdpa3
+        ipv4Loopback: 192.168.0.201
+        ipv4NodeSid: 17
+        isEdgeRouter: True
+        name: AGG_SWITCH
+        ofId: of:0000000000000205
+        routerMac: 00:00:02:01:06:01
+
+    # Setup the OLT switch port
+    port#olt_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 1
+        host_learning: false
+      requirements:
+        - switch:
+            node: switch#leaf_1
+            relationship: tosca.relationships.BelongsToOne
+
+
+    # Port connected to the BNG
+    port#bng_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 31
+      requirements:
+        - switch:
+            node: switch#leaf_1
+            relationship: tosca.relationships.BelongsToOne
+
+    # Setup the fabric switch port where the external
+    # router is connected to
+    bngmapping:
+      type: tosca.nodes.BNGPortMapping
+      properties:
+        s_tag: any
+        switch_port: 31
+
+
+    # DHCP L2 Relay config
+    onos_app#dhcpl2relay:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: dhcpl2relay
+        must-exist: true
+
+    dhcpl2relay-config-attr:
+      type: tosca.nodes.ServiceInstanceAttribute
+      properties:
+        name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+        value: >
+          {
+            "dhcpl2relay" : {
+              "useOltUplinkForServerPktInOut" : false,
+              "dhcpServerConnectPoints" : [ "of:0000000000000205/31" ]
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#dhcpl2relay
+            relationship: tosca.relationships.BelongsToOne
+
+    # ONU Whitelist
+    service#attworkflow:
+      type: tosca.nodes.AttWorkflowDriverService
+      properties:
+        name: att-workflow-driver
+        must-exist: true
+
+    ALPHe3d1cfe3:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1cfe3
+        pon_port_id: 536870912
+        device_id: of:00000000c0a86470
+      requirements:
+        - owner:
+            node: service#attworkflow
+            relationship: tosca.relationships.BelongsToOne
+
+    ISKT71e80080:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ISKT71e80080
+        pon_port_id: 536870912
+        device_id: of:00000000c0a86470
+      requirements:
+        - owner:
+            node: service#attworkflow
+            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onf-p4-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-p4-demo-pod-olt.yaml
new file mode 100644
index 0000000..7bb664e
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-p4-demo-pod-olt.yaml
@@ -0,0 +1,112 @@
+# Copyright 2017-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.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onf-p4-demo-pod-olt.yaml http://192.168.100.1:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/oltdevice.yaml
+  - custom_types/onudevice.yaml
+  - custom_types/voltservice.yaml
+  - custom_types/technologyprofile.yaml
+
+description: Creates OLT devices
+topology_template:
+  node_templates:
+
+    service#volt:
+      type: tosca.nodes.VOLTService
+      properties:
+        name: volt
+        must-exist: true
+
+    edgecore:
+      type: tosca.nodes.OLTDevice
+      properties:
+        name: EdgeCore OLT
+        device_type: openolt
+        host: 192.168.100.112
+        port: 9191
+        switch_datapath_id: of:0000000000000205
+        switch_port: "1"
+        outer_tpid: "0x8100"
+        uplink: "65536"
+        nas_id: "NAS_ID"
+        serial_number: "EC1721000208"
+      requirements:
+        - volt_service:
+            node: service#volt
+            relationship: tosca.relationships.BelongsToOne
+
+    technologyProfile:
+      type: tosca.nodes.TechnologyProfile
+      properties:
+        profile_id: 64
+        technology: xgspon
+        profile_value: >
+          {
+            "name": "4QueueHybridProfileMap1",
+            "profile_type": "XPON",
+            "version": 1.0,
+            "num_gem_ports": 1,
+            "instance_control": {
+              "onu": "multi-instance",
+              "uni": "single-instance",
+              "max_gem_payload_size": "auto"
+            },
+            "us_scheduler": {
+              "additional_bw": "auto",
+              "direction": "UPSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "ds_scheduler": {
+              "additional_bw": "auto",
+              "direction": "DOWNSTREAM",
+              "priority": 0,
+              "weight": 0,
+              "q_sched_policy": "hybrid"
+            },
+            "upstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ],
+            "downstream_gem_port_attribute_list": [{
+                "pbit_map": "0b11111111",
+                "aes_encryption": "True",
+                "scheduling_policy": "StrictPriority",
+                "priority_q": 1,
+                "weight": 0,
+                "discard_policy": "TailDrop",
+                "max_q_size": "auto",
+                "discard_config": {
+                  "min_threshold": 0,
+                  "max_threshold": 0,
+                  "max_probability": 0
+                }
+              }
+            ]
+          }
diff --git a/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml
new file mode 100644
index 0000000..c91c1cc
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml
@@ -0,0 +1,96 @@
+# Copyright 2017-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.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onf-p4-demo-pod-subscriber.yaml http://192.168.100.1:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/rcordsubscriber.yaml
+  - custom_types/bandwidthprofile.yaml
+
+description: Pre-provision subscribers
+
+topology_template:
+  node_templates:
+
+    default:
+      type: tosca.nodes.BandwidthProfile
+      properties:
+        name: Default
+        must-exist: true
+        air: 100000
+        cbs: 30
+        cir: 600
+        ebs: 30
+        eir: 400
+
+    low_speed_bp:
+      type: tosca.nodes.BandwidthProfile
+      properties:
+         air: 100000
+         cbs: 2000
+         cir: 5000
+         ebs: 2000
+         eir: 3000
+         name: 8Mbps
+
+    high_speed_bp:
+      type: tosca.nodes.BandwidthProfile
+      properties:
+        air: 120000
+        cbs: 2000
+        cir: 100000
+        ebs: 2000
+        eir: 5000
+        name: 100Mbps
+
+    edgecore_alpha_subscriber:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: "John Smith"
+        status: pre-provisioned
+        c_tag: 12
+        s_tag: 111
+        onu_device: ALPHe3d1cfe3
+        nas_port_id: "PON 1/1/04/1:1.1.1"
+        circuit_id: ""
+        remote_id: ""
+        tech_profile_id: 64
+      requirements:
+        - upstream_bps:
+            node: high_speed_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: high_speed_bp
+            relationship: tosca.relationships.BelongsToOne
+
+    edgecore_iskratel_subscriber:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: "Emma Brown"
+        status: pre-provisioned
+        c_tag: 11
+        s_tag: 111
+        onu_device: ISKT71e80080
+        nas_port_id : "PON 1/1/04/1:1.1.2"
+        circuit_id: ""
+        remote_id: ""
+        tech_profile_id: 64
+      requirements:
+       - upstream_bps:
+           node: low_speed_bp
+           relationship: tosca.relationships.BelongsToOne
+       - downstream_bps:
+           node: low_speed_bp
+           relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/voltha/infosys-pod-onos-netcfg-switch.json b/tosca-configs/voltha/infosys-pod-onos-netcfg-switch.json
new file mode 100644
index 0000000..fea8c47
--- /dev/null
+++ b/tosca-configs/voltha/infosys-pod-onos-netcfg-switch.json
@@ -0,0 +1,25 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "AGG_SWITCH",
+        "ipv4NodeSid" : 17,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+"dhcpServerConnectPoints" : [ "of:0000000000000001/3" ],
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}