diff --git a/deployment-configs/edgecore-pod1.yaml b/deployment-configs/edgecore-pod1.yaml
index 8985212..96d9489 100644
--- a/deployment-configs/edgecore-pod1.yaml
+++ b/deployment-configs/edgecore-pod1.yaml
@@ -34,6 +34,7 @@
     ip: '192.168.99.182'
     user: 'root'
     pass: 'onl'
+    fortygig: 'true'
 
 srcHost:
   ip: '10.0.3.56'
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
new file mode 100644
index 0000000..f4cb7a1
--- /dev/null
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -0,0 +1,48 @@
+# 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 BBWF POD
+
+---
+
+kube_config: '/var/bbwf.conf'
+
+nodes:
+  -
+    ip: '192.168.100.1'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '192.168.100.2'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '192.168.100.3'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:61:80:ca'
+    ip: '192.168.100.101'
+    user: 'root'
+    pass: 'onl'
+
+olts:
+  -
+    name: 'edgecore'
+    ip: '192.168.100.111'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
diff --git a/deployment-configs/onf-mcord-pod.yaml b/deployment-configs/onf-mcord-pod.yaml
new file mode 100644
index 0000000..4b99e69
--- /dev/null
+++ b/deployment-configs/onf-mcord-pod.yaml
@@ -0,0 +1,37 @@
+# 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 BBWF POD
+
+---
+
+nodes:
+  -
+    ip: '10.90.0.131'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.90.0.132'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.90.0.133'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    ip: '10.90.0.134'
+    user: 'root'
+    pass: 'onl'
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index 31a00a3..a1d2494 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -1,103 +1,3 @@
 ---
 # SEBA Values
 
-global:
-  registry: '192.168.99.181:30500/'
-
-images:
-
-  envoy_for_etcd:
-    repository: 'matteoscandolo/voltha-envoy'
-    tag: 'ams-1.0.2'
-
-  netconf:
-    repository: 'matteoscandolo/voltha-netconf'
-    tag: 'ams-1.0.2'
-
-  ofagent:
-    repository: 'matteoscandolo/voltha-ofagent'
-    tag: 'ams-1.0.2'
-
-  vcli:
-    repository: 'matteoscandolo/voltha-cli'
-    tag: 'ams-1.0.2'
-
-  vcore:
-    repository: 'matteoscandolo/voltha-voltha'
-    tag: 'ams-1.0.2'
-
-  onos:
-    tag: 'ams-1.0.0'
-
-# xos
-  xos_core:
-    tag: 2.1.4
-  xos_chameleon:
-    tag: master
-  xos_tosca:
-    tag: master
-
-xos-gui:
-  images:
-    xos_gui:
-      tag: master
-    xos_ws:
-      tag: master
-
-# synchronizers
-rcord:
-  image:
-    tag: 1.0.3
-fabric:
-  image:
-    tag: 2.1.1
-volt:
-  image:
-    tag: 2.0.3
-fabric-crossconnect:
-  image:
-    tag: 1.0.2
-onos-service:
-  image:
-    tag: 2.0.4
-att-workflow-driver:
-  image:
-    tag: 1.0.0
-kubernetes:
-  image:
-    tag: 1.0.2
-
-# kafka
-# NOTE: should make this a separate file or it will collide with other
-# definitions of 'image'
-#
-# image: '192.168.99.181:30500/confluentinc/cp-kafka:4.1.2-2'
-
-zookeper:
-  image: '192.168.99.181:30500/google_samples/k8szk:v3'
-
-# etcd
-# FIXME not used....
-etcd-operator:
-  etcdOperator:
-    image:
-      repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
-      tag: v0.7.0
-  etcdCluster:
-    image:
-      repository: 192.168.99.181:30500/quay.io/coreos/etcd
-      tag: v3.2.13
-  backupOperator:
-    image:
-      repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
-      tag: v0.7.0
-  restoreOperator:
-    image:
-      repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
-      tag: v0.7.0
-
-application_logs: |
-  log4j.logger.org.opencord.olt = DEBUG
-  log4j.logger.org.opencord.kafka = DEBUG
-  log4j.logger.org.opencord.sadis = DEBUG
-  log4j.logger.org.opencord.aaa = DEBUG
diff --git a/kubernetes-configs/flex-pod1-olt-voltha16.yml b/kubernetes-configs/flex-pod1-olt-voltha16.yml
index 109afd3..eb81693 100644
--- a/kubernetes-configs/flex-pod1-olt-voltha16.yml
+++ b/kubernetes-configs/flex-pod1-olt-voltha16.yml
@@ -19,25 +19,25 @@
 
 images:
   netconf:
-    repository: '10.192.4.244:30500/voltha/voltha-netconf'
-    tag: 'voltha-test3'
+    repository: 'voltha/voltha-netconf'
+    tag: 'voltha-1.6'
 
   ofagent:
-    repository: '10.192.4.244:30500/voltha/voltha-ofagent'
-    tag: 'voltha-test3'
+    repository: 'voltha/voltha-ofagent'
+    tag: 'voltha-1.6'
 
   vcli:
-    repository: '10.192.4.244:30500/voltha/voltha-cli'
-    tag: 'voltha-test3'
+    repository: 'voltha/voltha-cli'
+    tag: 'voltha-1.6'
 
   vcore:
-    repository: '10.192.4.244:30500/voltha/voltha-voltha'
-    tag: 'voltha-test3'
+    repository: 'voltha/voltha-voltha'
+    tag: 'voltha-1.6'
 
   envoy_for_etcd:
-    repository: '10.192.4.244:30500/voltha/voltha-envoy'
-    tag: 'voltha-test3'
+    repository: 'voltha/voltha-envoy'
+    tag: 'voltha-1.6'
 
   alarm_generator:
-    repository: '10.192.4.244:30500/voltha/voltha-alarm-generator'
-    tag: 'voltha-test3'
+    repository: 'voltha/voltha-alarm-generator'
+    tag: 'voltha-1.6'
diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
new file mode 100755
index 0000000..13b12b4
--- /dev/null
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQU9aRDZyRVIyRTBMTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGd4TURBMU1qTXlNek15V2hnUE1qRXhPREE1TVRFeU16SXpNekphTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRREtwZU9WTUFqVWQvK2JpQlYwTXhUbnVFMG50SGliaFozRmx5RFVqQzlFd2UzcGV0a0psbTJiWFBiR245YS8KOWhoZVVLMlgvVVBVWkErQ1NYZEQ4ZGFCQ0FwT1VvejcvSFNzR2xSZHBiVlpRaFA3TDZjV0wwRENSTmFFYUhHeApQNHBad2RWY2JMNXRzS1IwRk5ZVlljMXUvc2JmK1gvTlFkcHF4d0NFOGNpRHF4U1YrbEgxY3RjVStUVEl1K3lPCldCdHppUkNxVTYwT2tab1hvZGtvdHZVejFML3ZwTGU3NTc4KzY3cGQ5RnBrV2dIcGswKzBZMkxFQVdWMmxiSnQKazVUb0d5WVV6MXJvaWJxMkM2bGdDTFF2VFF1QjI4eW45aGRiZzRsWnBYZVBGYnQzYU1KVzJQcWY4UXI5UzlFQgprTm5JeE5YNGV5U2VOQWhaaFBCRklxY0hBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlNLMm9FUUJFVTlRSGhDCmNRQVVQVnhWeE5CdEJEQWZCZ05WSFNNRUdEQVdnQlNLMm9FUUJFVTlRSGhDY1FBVVBWeFZ4TkJ0QkRBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCMmZxYzFjWmVWYVY0a1pHRnNqM1N2RVhjTgpZcVkvU0xNZTZWYmJDQkdMdEhVelkraFZmdkhXc0pmcFpVUnIwL1p1eEQzNHZvZE9RZE82dUY5TnFXVW5Gc3NwClZqbEQ3U3dvVlA3bGFEWGVHYUhoeHg1M043QU1zT1VEVkpGejR0NHRYQmZJd0tCTGh4b3J1ZlFMVXNFTzgvTC8KVnp3TUNNRnJLVGVPOGVjK1phQmxwOVZFS05NMzZhZysyZ1BqMXlBN085UEFQaE9BcmNkYm02VE1qVXpyZUpXTgpOaUoyR1dWWGlaOXdzWDh3NlI5K2FNNFR5TGtnT1VEME1jRFlnVmRWbXgyWG1manI5RlpHT1ZXNU1FY3RkNGcrCmlPYWhxWVJvZlpIZWJESFBuRUFzZlduUGszWWpuc0Z1M2pxemRzcUJtaWZLM2swV2NEdGI3VTJrYTJEZwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    server: https://10.90.0.101:6443
+  name: cluster.local
+contexts:
+- context:
+    cluster: cluster.local
+    user: kubernetes-admin
+  name: kubernetes-admin@cluster.local
+current-context: kubernetes-admin@cluster.local
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFRENDQWZpZ0F3SUJBZ0lJY2kzNlo3RnRyQzR3RFFZSktvWklodmNOQVFFTEJRQXdFakVRTUE0R0ExVUUKQXd3SGEzVmlaUzFqWVRBZUZ3MHhPREV3TURVeU16SXpNekphRncweU1EQXhNRFl4T1RJd01qUmFNRFF4RnpBVgpCZ05WQkFvVERuTjVjM1JsYlRwdFlYTjBaWEp6TVJrd0Z3WURWUVFERXhCcmRXSmxjbTVsZEdWekxXRmtiV2x1Ck1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBd2w1eWVPUFk2SXZrZXpidmxlc3QKQUViSnJaWFFtdkJOUlhaTUE2cTVTeWZUQklORThoV3VjWVJiZ2tOVDdtc1BlTC9LWHliaERaaUgydzJVVm5IQwpidmk1Y0RmMUhBMUIwQUtjN3pNcDljZkdCUlJ4UWNWUnZXazdSRC93TWpiTzBqM1l0Q25xQXZ2MkpNUWF3aU5SClZqRjJNeGdab3E3bjZFaHdDQ2J2QThMVndJKzNKSDUvRktkajRWQm5iL0h6K0JYcXRHVm5xcy9NLzlzNTdQZisKeWtidFlpTTZJbnpJZkUrWjBDREFUYTU0VG9DOWpYT1JNdWlHam1BMjQ0emJ3TlhiQkpRcVNnaE5CNUFkRmpKbAoyd3ArRHRCNmo5YUFmNmZybjJMdzhLTjBObFVHT2xhYjVPV3ZkWlhRazA5OHlSRlJQNlVpSzQ5ODVsK0RUTmRRCmJRSURBUUFCbzBnd1JqQU9CZ05WSFE4QkFmOEVCQU1DQmFBd0V3WURWUjBsQkF3d0NnWUlLd1lCQlFVSEF3SXcKSHdZRFZSMGpCQmd3Rm9BVWl0cUJFQVJGUFVCNFFuRUFGRDFjVmNUUWJRUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUlnaWVuVTNqeGhrb0kySnVrWG9QbG1JU09mL05PcG1QNGRaTlFpeW42NUFNTTRxck1WM1hWWExKNERICnFnZ0VDbndOdm1KUWRCb1MzRi9kaXdqaHg3SDdKVFJJY3FBeVJJeFVFMzE0bVdWZlNvbmFzQ2xRbGdGVG9iUlEKVDRxcWRDcis2S3U5N0RJUkpqODVwL1RMNjkvT1owK1BxVnFmNE5tZGVWNkoyZnZBQXp3YS9FWSt6d2V4aGw1ZAo1RFFudUdDa2Q1WW9BSHRabUtaRUdsdFFnTFVxOXpQNy8yZjhSV1hkMkJabnk5VU9kekl1R0lQSXdGTHhBb0l4CjloNWxBZkwyb1h3MFhpdTh6SkRJOXRUUzZ5UXphL2NVaVNKU0RFWE82ZGV1M3B2UGFiM3lXaVZtai81enNIWUsKOGhiRjl1SElhQW5JNVdqMGRlYWVibFA1blY0PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBd2w1eWVPUFk2SXZrZXpidmxlc3RBRWJKclpYUW12Qk5SWFpNQTZxNVN5ZlRCSU5FCjhoV3VjWVJiZ2tOVDdtc1BlTC9LWHliaERaaUgydzJVVm5IQ2J2aTVjRGYxSEExQjBBS2M3ek1wOWNmR0JSUngKUWNWUnZXazdSRC93TWpiTzBqM1l0Q25xQXZ2MkpNUWF3aU5SVmpGMk14Z1pvcTduNkVod0NDYnZBOExWd0krMwpKSDUvRktkajRWQm5iL0h6K0JYcXRHVm5xcy9NLzlzNTdQZit5a2J0WWlNNklueklmRStaMENEQVRhNTRUb0M5CmpYT1JNdWlHam1BMjQ0emJ3TlhiQkpRcVNnaE5CNUFkRmpKbDJ3cCtEdEI2ajlhQWY2ZnJuMkx3OEtOME5sVUcKT2xhYjVPV3ZkWlhRazA5OHlSRlJQNlVpSzQ5ODVsK0RUTmRRYlFJREFRQUJBb0lCQUJ3NE1EQ0REQnYvSzRZRQpITmJNVlRWRUVjWGxDV3RsVmlLdW9TeXJIY25lbDFHQmFZSW9TYkpyZ0FteWtyMzd4enhGeERENmFSUmJQK1k2CjIzMk5lS2c1N2xwdmxXT2tQUmpoT0QyMlZQSTlOZS9JM3dTb2pFeU91YThZQlZ5VS9vUWh2Sk96dmlqK3dlYm0KbmVmdnpzQlA0QlJjL0dQVk54QlBiQXlTOG9LK0J3UENaVzUzcWZCWkxOSEZyS0RiUDdDMGRRTUxzVVpqem1IUApWcWVXZjg3T2dLOGtoTWdtejJnd1lCUmprN29acGJZOG5Fc084cTlOV2ZsbmJSUzVLV2VSNFRTUXFyY3dpTEJ0CkJCdVZVc3U4bDZ6aGZlS2ZlMXdkOHBZc3lweEs1RWxWNjJvWVRhZGROU01UUXJ0UnJOYkpJTHBCS2FGZG5ObkYKbnJHYmJvRUNnWUVBMDVlQ01CR0Y3Q2tkUEk0Nis2L0hITkEwbkVTS01rWGM2ZllPc1ltTjRDNy83dnk3Z0JHYgpidndqVEpESWtld21MVjdKTERteG5XcUM2UWR4T1BkTE5nU0dhdFdBeFh2aUNjOWE5WGc5Q2NBbmFDNkVqd0hoCmd5Tmlyd0VhZ1hQK0FjM0FpZGNIWVAyalJwakF3T0RraDNaUi9ZZlByMENablQyS3ovMGpSYUVDZ1lFQTZ5bVUKYzFSZnpBbndhaUY4RkVUQ0IvMUpJOVU5NmZwTHJkdU9sZERjQmpJU0k2cytyQWZNSWk4ckZYUDZ5b3V1cWdWNQpkUHAwTFZvL1VuNzFmV1RyRjBnTDhKMm9oUjgxQ1dBSTZLUzZFLytSY2VldzM2SHYvR0F3dDJIS1pGR3hTOS9sCnpKZE1IYXFzWDk1b3NaRnI1VTFyek9vUmN5d3l3T3g3NXRyZy8wMENnWUVBcmpvM1RQVmczUkVOcmVzL3pqYnoKTVZxUHQ0MElibFR3andXNUc1ODBYOERUcFNvZUNscDFMbklYYnRoWkR5N3dVTE9YMnY2MnJmUWlUMWQ5ZDNiSgpTM1YyYVVuY2VzQ0RZNmlHTVZJTWtKYlUzQWhSeHArNTNZMnBtSWpFRm93NFA2djRPb2dBMzNCNm5ZcnlUTi9oCnpWazBNaHMrZkFRcGVUeFByT3UzdTRFQ2dZRUF3bWRUUTZ4Q3JZaWg2UHJaZW1BRkQxbkNOdzgzNmM5eTlMMEcKdUs4NjFSeGJob1V3Z0VMSjdKQ1Z5MXhmdlVXUUZSb0ZlRUQ3L2VvWFl2bDF0RDNUWXlHNlRTWG9oSFJ5QWRnVQpSVTY0VFlQL0Z1ejBlVXVEKzEwQnFQZjh1c1lXRGFXQWNZdTU3dVNETDVYTGNzL0hKSDdHV1ZZL0tya2xFL3ZyCnljSzBNaGtDZ1lCMlY5ZXI1dEg5MDJCOUFjR3JnUC9vdExVQnpJU3N2RmJwRExaRmlsazA1UlNvYi9JYmZlSlYKU2NmelR1dm1xSFBsbExRdUZqelZ3bTNIUTMyem1HSkkwT0F0WVdvTEZMSWMwVmhaMXgvRFlEVGZRZ01oOCt3RwpkVE1iRnVYTzh3SmNRK1VoamJTTVFKaXRKOUJrcEFYU21NZjJqajBDbUtZOEVaTUp6Z2tHUWc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
new file mode 100644
index 0000000..a06ef52
--- /dev/null
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -0,0 +1,93 @@
+global:
+  registry: 192.168.100.1:30500/
+
+image: 192.168.100.1:30500/confluentinc/cp-kafka
+imageTag: 4.1.2-2
+
+images:
+  vcore:
+    tag: '1.6'
+  
+  vcli:
+    tag: '1.6'
+  
+  ofagent:
+    tag: '1.6'
+  
+  netconf:
+    tag: '1.6'
+  
+  envoy_for_etcd:
+    tag: '1.6'
+  
+  alarm_generator:
+    tag: '1.6'
+
+zookeeper:
+  image:
+    repository: 192.168.100.1:30500/gcr.io/google_samples/k8szk
+
+etcd-cluster:
+  spec:
+    repository: 192.168.100.1:30500/quay.io/coreos/etcd
+  pod:
+    busyboxImage: 192.168.100.1:30500/busybox:1.28.1-glibc
+
+etcdOperator:
+  image:
+    repository: 192.168.100.1:30500/quay.io/coreos/etcd-operator
+backupOperator:
+  image:
+    repository: 192.168.100.1:30500/quay.io/coreos/etcd-operator
+restoreOperator:
+  image:
+    repository: 192.168.100.1:30500/quay.io/coreos/etcd-operator
+
+grafana:
+  image:
+    repository: 192.168.100.1:30500/grafana/grafana
+  sidecar:
+    image: 192.168.100.1:30500/kiwigrid/k8s-sidecar:0.0.3
+
+prometheus:
+  server:
+    image:
+      repository: 192.168.100.1:30500/prom/prometheus
+  alertmanager:
+    image:
+      repository: 192.168.100.1:30500/prom/alertmanager
+  configmapReload:
+    image:
+      repository: 192.168.100.1:30500/jimmidyson/configmap-reload
+  kubeStateMetrics:
+    image:
+      repository: 192.168.100.1:30500/quay.io/coreos/kube-state-metrics
+  nodeExporter:
+    image:
+      repository: 192.168.100.1:30500/prom/node-exporter
+  pushgateway:
+    image:
+      repository: 192.168.100.1:30500/prom/pushgateway
+  initChownData:
+    image:
+      repository: 192.168.100.1:30500/busybox
+
+elasticsearch:
+  image:
+    repository: 192.168.100.1:30500/docker.elastic.co/elasticsearch/elasticsearch-oss
+  initImage:
+    repository: 192.168.100.1:30500/busybox
+
+kibana:
+  image:
+    repository: 192.168.100.1:30500/docker.elastic.co/kibana/kibana-oss
+
+logstash:
+  image:
+    repository: 192.168.100.1:30500/docker.elastic.co/logstash/logstash-oss
+
+oltAppUrl: http://192.168.100.1:30160/olt.oar
+sadisAppUrl: http://192.168.100.1:30160/sadis.oar
+dhcpL2RelayAppUrl: http://192.168.100.1:30160/dhcpl2relay.oar
+aaaAppUrl: http://192.168.100.1:30160/aaa.oar
+kafkaAppUrl: http://192.168.100.1:30160/kafka.oar
diff --git a/kubernetes-configs/onf-mcord-pod.conf b/kubernetes-configs/onf-mcord-pod.conf
new file mode 100644
index 0000000..c6d2403
--- /dev/null
+++ b/kubernetes-configs/onf-mcord-pod.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1ERXhOVEl5TlRZME0xb1hEVEk1TURFeE1qSXlOVFkwTTFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTkxjCmhtK1NBU05iNzVIcEdBUDhIaGQ5bDRXcTEzemF0MUdKUTdDN2FuWCsvNGpaZENaVzhyUDNHM2RZV096RHhzdUwKK3ZwTXU2QUVOT1oyRENkNWo2OUlDazkxQjlLNWk4WG5LeEFSbXNydnhaY21EYXFtenAybUJmVnk2WTE5eXRZUAo4T2Ruc3lvVkVaMXZaL3pCd0Y0N0ZSSkJPWk9aaUdMdUg2UmdPbXFDQ1JKMC85MVBheVRjT1hyY01qWDdySkQwClpobzFjdnNVRjlHUUdVRlcrdFJ0cW11YjhmcGxpdmN2UXVuQUZneFVwTW1wRDV2eDg5VzVmVUZjYm9GZWNnT28KSit0QnVzejRqV2xQd1hNUy96S0pMUmphNzRHK3V4aEdoNkdSMmFzZ0NDTDU1RjJwK0JiT2JoNldIL3JHME5CSwo1U3VYUGdybXhOUG5TYXB0Z29zQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFEbFNNei9PNVA5S1FMWUNxNi9za2lvdnhueG4KU2tIOUd3Rm1mZG9XM0xFSk9qelFwN28yMUU2TzhoUm1UeXN5ZEd5QzF4UzRuejFUR3ptOVVvdlZXMGN5cE9obQozOG8rdFBsaHArNW10aElPYVJUQVBhdDdZNktKYk8rcUZwandNekZWV3ZkU3JOcE0waDRoQzBHS3MwcUNvRmZKCkRxODZxK2tUWGtZWmxqTVJET2dCb3YvMUJ0Njl4Wi9mcTE5MkFVcmRsTG9CS1lhZVlHaEI4Tks5Q1ZVVHlRQnMKMmdncmFmYmE1MU9nR3FjVEM3WHkxK3J1SlNsb3pVUTFFL1RXclVPM25tWENoU3RLQ0pmbW1SVDY1cFlhcjJ2RwpzWjNLaFVZaUxqMnhHNHY1eHlzbGlnNVdzTllYVGJmVUlyM3NKN3V4aE1hNzU4WGNXaWhtVkVNQ1hKWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.90.0.131:6443
+  name: cluster.local
+contexts:
+- context:
+    cluster: cluster.local
+    user: kubernetes-admin
+  name: kubernetes-admin@cluster.local
+current-context: kubernetes-admin@cluster.local
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJUFhvYjRHUERRNnd3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeE1UVXlNalUyTkROYUZ3MHlNREF4TVRVeU1qVTJORFZhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXpSR1lJV2E5dDlhZmh4c1YKWC9lOHNZNW0rc3BMa1dDZ3hXYmxiK1UxSFRwaG82RnZodm5rNDFXNGI5ZzBzL2RMaXViR09jaXFoU29rY0E0OApzT1J2NkJJU3grdGpWVktqclNlSmt0dURyMjRIUWg4OEw2RHhwZkp2T3ZWWGROSU8vZms4MzNzb2JkRUZzT2JPCkpLeXBBOCtQaHpZWkFMVXIyR1NyV1cvMWlXRTlRT3pGY3RwWmlwVkxQKzZHb3FxQ0VSdnlxSVJDejJlbkRuUFoKdHd4U0plUVc3M2p1WCtJelZoTGp1Q3JLQnJTQ0VidkI0WktWYWtmMUxlMU42SUtDckdzRGJyUTZtdG50M1hnYQowVGpnRjByMWNnRlpINExCZG1icENTQnZaYm1odlI4RnlINXQvbHpLUUxicDc2bnV3MDBzb0RFNjBmTXU0VVZYCjBNUW9XUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFBVERJSXRkVklxa25VYmh6cHU3SFpRSjd4bUlxbHRIZTd1eAphY2ZLRitPcS9jYm91MGtjN2x1clFjTFJRYWR0ZDM3L0Zkd3c2SlE3SXlsK0Q3S0tEMUNyVVo2aFlRdTZLYWpkCmY3dWpGUjdsVStqMjIybEU4UWh5S3Q1Q3R1dUR0UkRENWMvWjZQZzFOR3hJemMzNHRMTmNNSHFLa05RYzczWlYKd21KRVRQZzZ1RUVHcEsveVpycVJoQzVUUzlaSmlTZi9GMjF2UHNaTnpSSzNKQzlUam96cnFLbFpQUmZINlU5NgpEeWJWeUhNbm9KT0RrOVdqRjJqMTJ4YzdyL0ZnZmtaMEkydGdFQ2pkMGdkekU4NUFDVmRUck4vN3RhYzJwZVJrCkUzNjJSa05Jb2EycFlnTUd0NTJxR3lXb3luT0FUVnd2bEluY0Zlelh1bjNybGI3SHdNST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBelJHWUlXYTl0OWFmaHhzVlgvZThzWTVtK3NwTGtXQ2d4V2JsYitVMUhUcGhvNkZ2Cmh2bms0MVc0YjlnMHMvZExpdWJHT2NpcWhTb2tjQTQ4c09SdjZCSVN4K3RqVlZLanJTZUprdHVEcjI0SFFoODgKTDZEeHBmSnZPdlZYZE5JTy9mazgzM3NvYmRFRnNPYk9KS3lwQTgrUGh6WVpBTFVyMkdTcldXLzFpV0U5UU96RgpjdHBaaXBWTFArNkdvcXFDRVJ2eXFJUkN6MmVuRG5QWnR3eFNKZVFXNzNqdVgrSXpWaExqdUNyS0JyU0NFYnZCCjRaS1Zha2YxTGUxTjZJS0NyR3NEYnJRNm10bnQzWGdhMFRqZ0YwcjFjZ0ZaSDRMQmRtYnBDU0J2WmJtaHZSOEYKeUg1dC9sektRTGJwNzZudXcwMHNvREU2MGZNdTRVVlgwTVFvV1FJREFRQUJBb0lCQUY1WUZOeHhEeUZ2M1U3awpGKzVoNUc3dnE5TC9sTXFhWVB6UWZRZ0F0SEh3OVJDNTZieDRaV1J0Z0gvOFFTcjJ2OHQwcG9mWkdSSlF0QmpWCmcvaUI4RFlkY29TRmQ5cStQVTBoWG5xeEFTR0poazlXWFhNd0lWeU9iN3Y1T2JZbUdmMmdWL0FkRWhtTHk0bDYKZGlhTFJPcmE2QloxdmdVRVZOcW1YZXEweG9yZjNlQm8yZjdOa1dVOVM5Z3BZQVVHUzR2K3hNMXBocnpEV3NWdApTUExOQzA5djNTMTVqWXBQbm5CQkZNV3hoMlMxQ2xVb2ltVU43K2o0SUpuNkhsSHRxcFVuZmNHR0pDZ2FpblpSCjVkM241VnFsMk9IS2ExZlVnZDhoRFRpemNZY0NrL1p1RHNBQzJEOENOaUZ3Z2tSU0FLU1F5TUNWUGlXVTBBOFgKQVZBOHgzMENnWUVBNHpieENTc0N3RFdXMmZXN3I1MmZzTHJiTk10dWlVbnNtVk5jTzZYcEhRZjB1TW42VmE2VgpDTFgxWFB5ZCtTVzJoelpYRGFDNzh3NDBmSG9XejVRbG1kOUNPNzZjeUhJTFpFVVZoNFo1Yjk2d1JCTnJ5QU5HCndkZDFQNnZSdDZlVVhaN1ZuMW4wZmtXMWdleVhUdnpKd2F4UGt2U1NCSFNnSFZXaFJFcDJHVXNDZ1lFQTV3eHAKK1ZTNTQzKy9KeVZqMW00eUZQWktHOGJOZ0oxdWp6YmI5WlpZdVFnQW1UUkZPOTIwdGlLeVFZQ1FOaUNURXcvZgo5Umx5bllNb2NEeUo4cjVreEhBTS8rTVI2OWcxUndOZlBLb0JmaldBNU5leENwRHdXN3JleG9nakRIVkZGczNOCjNtL3pvamhxZzU4VTNmM3Z5RHZSdDlueVdKbWlMOTNBd1F0L0Ftc0NnWUVBbHhEdlh3NFdyUjYwSmtRb1BsSEoKVzZKUW5pQm5aS1lleGE1VDAyQ3l4ZGVGVU5zUk1xaDVkQ291Y1YyUDFwZkpiTXFuUkd0S3F3WVZ4WEVTKzM1ZgpKWmYzbkd0V0tEc1M4ZDZ3dXNPZ3Q4MVNXbUNqTjM5ZUt3RUtkb1BSVW83N3FPY3kxdGpqSXBWTVlZNmc1eVpSCktoQmJjN1JoNU01NXFpZEZxbmJyWUZNQ2dZRUFsejRWRU5WWmFZWnlCcG4vSkpxMXhlc0N6L1B2Q2NZRVhWTTMKNFNjdHBOR01NcjE0cEp1WWM3RjZwazRXR0poeUxnUXlRaXNLVC9sUE8wa2xzL1RWMlpEUHNhRmVWZGdONkJKWgpBVWozK1Rua3llZzNTQWRnajJ0ZjhPMmtvNzhRSHNGUmhjNGEyWkc4aDdSVzRJb2RzQ0VZUXhVMEFyTnU2NDVwCll2UzNpMGtDZ1lFQWxPMDBFanpjUEJmanUxb1hyTC9lY2lyS3lQNTBtQVgrTktWNldYaDZTZzdPUkJjS2NrRk4KRndYeWlhQ2RKcXloZjQ0Rk9rUzg3MUhaa3ZaUGUrVFFyRGxIZVZQQTJBU2NxSzlOcWVxQzdQalVLV1VoTktSZgpvS2RFWDJmaGtrVm5TVjhXdklxYUhYaHlJbXFTQUJwRFQ2TkdkbzRydFJ2WXUxeVRIV3NEa3hFPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes-configs/onf-mcord-pod.yml b/kubernetes-configs/onf-mcord-pod.yml
new file mode 100644
index 0000000..73b314f
--- /dev/null
+++ b/kubernetes-configs/onf-mcord-pod.yml
@@ -0,0 +1 @@
+---
\ No newline at end of file
diff --git a/kubernetes-configs/onlab-pod1.conf b/kubernetes-configs/onlab-pod1.conf
index 4aff321..5e8edcf 100644
--- a/kubernetes-configs/onlab-pod1.conf
+++ b/kubernetes-configs/onlab-pod1.conf
@@ -1,19 +1,19 @@
 apiVersion: v1
-kind: Config
-current-context: admin-cluster.local
-preferences: {}
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQU9aRDZyRVIyRTBMTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGd4TURBMU1qTXlNek15V2hnUE1qRXhPREE1TVRFeU16SXpNekphTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRREtwZU9WTUFqVWQvK2JpQlYwTXhUbnVFMG50SGliaFozRmx5RFVqQzlFd2UzcGV0a0psbTJiWFBiR245YS8KOWhoZVVLMlgvVVBVWkErQ1NYZEQ4ZGFCQ0FwT1VvejcvSFNzR2xSZHBiVlpRaFA3TDZjV0wwRENSTmFFYUhHeApQNHBad2RWY2JMNXRzS1IwRk5ZVlljMXUvc2JmK1gvTlFkcHF4d0NFOGNpRHF4U1YrbEgxY3RjVStUVEl1K3lPCldCdHppUkNxVTYwT2tab1hvZGtvdHZVejFML3ZwTGU3NTc4KzY3cGQ5RnBrV2dIcGswKzBZMkxFQVdWMmxiSnQKazVUb0d5WVV6MXJvaWJxMkM2bGdDTFF2VFF1QjI4eW45aGRiZzRsWnBYZVBGYnQzYU1KVzJQcWY4UXI5UzlFQgprTm5JeE5YNGV5U2VOQWhaaFBCRklxY0hBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlNLMm9FUUJFVTlRSGhDCmNRQVVQVnhWeE5CdEJEQWZCZ05WSFNNRUdEQVdnQlNLMm9FUUJFVTlRSGhDY1FBVVBWeFZ4TkJ0QkRBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCMmZxYzFjWmVWYVY0a1pHRnNqM1N2RVhjTgpZcVkvU0xNZTZWYmJDQkdMdEhVelkraFZmdkhXc0pmcFpVUnIwL1p1eEQzNHZvZE9RZE82dUY5TnFXVW5Gc3NwClZqbEQ3U3dvVlA3bGFEWGVHYUhoeHg1M043QU1zT1VEVkpGejR0NHRYQmZJd0tCTGh4b3J1ZlFMVXNFTzgvTC8KVnp3TUNNRnJLVGVPOGVjK1phQmxwOVZFS05NMzZhZysyZ1BqMXlBN085UEFQaE9BcmNkYm02VE1qVXpyZUpXTgpOaUoyR1dWWGlaOXdzWDh3NlI5K2FNNFR5TGtnT1VEME1jRFlnVmRWbXgyWG1manI5RlpHT1ZXNU1FY3RkNGcrCmlPYWhxWVJvZlpIZWJESFBuRUFzZlduUGszWWpuc0Z1M2pxemRzcUJtaWZLM2swV2NEdGI3VTJrYTJEZwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1ERXhNREl6TURneE9Wb1hEVEk1TURFd056SXpNRGd4T1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTlg2Ck95MC83a1Z0b1BiSTFRRmxabFpYV0lIcE1waUNEUzlqY1AxdlNuMWsvckdFWXBvYnA1dGFJR3B5aGJzZkxuV1IKaVVxSCtJWVE5TVpHUWhRUDY1cnE5ZndTTHNMZUNuZitUV2Rib2ZkV0Q2Qm8vUWs4RDd3UVlsVTB4bHVNdGdBVApHUEdPb3hYV2hLOHNicDNBY0E3NDZkeGcvemk4UlVKdTNjZmphaGRjc1NmaE8wNmMvd0VuVXI0VHhkMlBNSjkxCnFiVmVXTEczUS9ESVp3bHFnMGJLc2E4eUR0RTlndFRPckhBS2NTWWgvM25FTmxlZzI3UzFKQnBLdjdPdGEwTU0KbGdQTWVVZDVuQzY1ZWRXcXZycWxHLzYwK0dVREt6UUV0cGVSRlNxektSNWZOOTRLYlJ5TEFnOHBXb1FRSUEwRApaWkdIWnQzQno5OTZIb0hCMmtNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFDUkxxVWdzODYrODh1VkRLM2NzcGNGQWIxZkEKajB3YUlXendZOGN1TWFwTU5lbGljOW5YTlluRElBSytCbUZ4ZkNWTzh1Lzk4U2Y2YTFrV3lUVDhQNVZFTU40SQpiY1RzdzVpY285eWcvamprSWFSaVJmRE41aUlYYWZsYUJRZ2pxNnJzWUpIV1FqTGdDZUsyN1B5NEVHdFIwcmZVCnVzVVd6WTNMa1pqM2x3cWZrWXRIckRqaEk5b2dSTllNeW5FNFlyNVROeW1XMURHYnpuM1dEQ2IveWdUczlyZ3oKaU9YWnJGQk5kcmZYUHdEQnNsWi9tNnovQTkrYXZBR1AxK3lWZXRMTEJQejJzSDFXeXJWUjhQa1hBcS9sT2R3dQp6VkdSa2JWc3gwbDg5dmFGYnRoSTFBb2J1L1ZJciszZ2IvR3pLQjFZZ2dpeUoyS3p6VEg3MmpJd3J2TT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
     server: https://10.90.0.101:6443
   name: cluster.local
 contexts:
 - context:
     cluster: cluster.local
-    user: admin-cluster.local
-  name: admin-cluster.local
+    user: kubernetes-admin
+  name: kubernetes-admin@cluster.local
+current-context: kubernetes-admin@cluster.local
+kind: Config
+preferences: {}
 users:
-- name: admin-cluster.local
+- name: kubernetes-admin
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURvekNDQW91Z0F3SUJBZ0lKQUxnb1BxSExCMkRPTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGd4TURBMU1qTXlNek16V2hnUE1qRXhPREE1TVRFeU16SXpNek5hTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXhHeVlzWktleHhGank3Z24KRHdzVjFHM21VTjh6a3VOdkVxY1NnV1U4bXRBWnd5eG9vTVFGdG5pUzFRbTFpZUJMUkxQOW9mY0s1azU1bUVLNwppVSt4NGxFL05tajJVZDNCUUFjc1d3NHNYWDJBM2h3S21SRVgwcVJ2UkNwbWQ3VEVmUjcvdjFTWUdMOVR0bFZZCkJxa2J4UldxMnlTbGRGVXNUS0lkNDR2eWxqc25kSHd0NFVVZVcrcXdjTkwrMk1keEZ1TVIrckZBa0I2cDhsc20KQ0lMbnhPekNaekZEckVZRjBOQnR3MHFZWWZwbS80eXIzRHloK21JOHl5VjRjWnRJTEdoUGJyWi9GcE5hV0J5Rgo2RlV1R2VHRCtUNGRDendYQUQ2c0E1RmxCWmkra0FsS1d3RUIvNkFaMkw5dVdmTnBXSFQyQ3pDSFVPbFkyb1hTCi8zQ1k1UUlEQVFBQm80SFhNSUhVTUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUc1QmdOVkhSRUUKZ2JFd2dhNkNDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnZ1Z1YjJSbE1vSWRiR0l0WVhCcGMyVnlkbVZ5TG10MVltVnkKYm1WMFpYTXViRzlqWVd5SEJBcGFBR1dIQkFwYUFHYUhCQXJwQUFHSEJIOEFBQUV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFJWkpuZHlPRGpDdjRUKytjT1lJRnVkVk9CanpvS2lzczFDb3RHM1lEdDdlOTdoelJ4QmdQcDJ2Cnk3WGQ0NnhrUHByYVRRcTBQZXlINHd6RUdBMHdvSnFmZlM1ZkFFU0p0L0lhK1l5UmlOTElycDNFK08zeXZsaHAKUldwWlZ3d2hCT2JTQmxEMkYwMkJPUFpQOFB1WVlnWTZrS2lNVGpYNGh0RjVSY1FvdXhaSGlQQ0M0bnIyUUZYaApWTUdtTGpnV2VjY2lOaW42Z0xTTU9zOXdMWjNQa3pyV1F5eG1iOXBDdUtQa0VWRGVPRm5rL1J6dDBZNWU5YTFoCjFiMG9IOWJPUlNpZXp0a0V0dDcyNVB6eWora3JEKzNneFFiSTQ0MEdYcUkweXR1bktVSWVOVnNFa2tDb3lPdzEKd3lOVy9iU1VSV1JxaFdIbmlDRUVoV3RrZjU2b0FpTT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeEd5WXNaS2V4eEZqeTdnbkR3c1YxRzNtVU44emt1TnZFcWNTZ1dVOG10QVp3eXhvCm9NUUZ0bmlTMVFtMWllQkxSTFA5b2ZjSzVrNTVtRUs3aVUreDRsRS9ObWoyVWQzQlFBY3NXdzRzWFgyQTNod0sKbVJFWDBxUnZSQ3BtZDdURWZSNy92MVNZR0w5VHRsVllCcWtieFJXcTJ5U2xkRlVzVEtJZDQ0dnlsanNuZEh3dAo0VVVlVytxd2NOTCsyTWR4RnVNUityRkFrQjZwOGxzbUNJTG54T3pDWnpGRHJFWUYwTkJ0dzBxWVlmcG0vNHlyCjNEeWgrbUk4eXlWNGNadElMR2hQYnJaL0ZwTmFXQnlGNkZVdUdlR0QrVDRkQ3p3WEFENnNBNUZsQlppK2tBbEsKV3dFQi82QVoyTDl1V2ZOcFdIVDJDekNIVU9sWTJvWFMvM0NZNVFJREFRQUJBb0lCQUJpRkNlYVl5L05EcTNhQgp6WFptUnRwV3dicDBzbVp5dDZuWGEwcjF6VVB5R0ZVeDFQbkVub1h4dFRxYzFLbWFjeXJuWVJEMzJzZDNJbHlzCmIrYXJLU1I4U2V6TDIzdkt0OVg3VDBFcW1zVXM1b3BUYTh0QncveUtoRTA1RWNOOXNFMkNNaUM3T2FWVk5PajgKN0ZrZ2dSUHdLWHpqclRmQmJoOCsyWVpQTVFBcHQrODNXbVc4a285VU1Ec2Zad1hkMHRCWk8xaWh5bzh1T0xyWgo5YVBxb3J6RlNPYlFWdm5GZTNYVlZqdkI4RVFGS2ErT2dsWDRhTjN3QSt3U1FndmhyZWp6cWhFQ3JmeTZQeUt3CmI0c0czb0sxTXpOdFFmSnpUc0NGYUtpN3lTQlEvdnZEdk9uQlB5MzdRblJYV2tEaGdzUzZrYnk3d2pXNVNEVXQKbTJNK1J3RUNnWUVBK1FGQ2d4MHlvUmFzQ3Z6K0lhYWhBQ3hSZWdSNmhXNUQ5aUdWUFRPbmFPWHJZK2JWbUtEOQpsZDJrcXpQYlFzK3dNVzIra3ZTVFd6OE82TER5ODVvTlQxUDY5dVVCMkx1NzlnYUdMRjlpSUNhNStOQXlRckljClA1bndDbUYzYXU2cG5SbUdLallYUmZqV2JzSHhrMWZtSnNockg3aDJ0OFlNcHlYVENEb3hITUVDZ1lFQXlmRXkKcTNPWEVIaWlVejBVK2hIc2w1WjhVeGVoSGl3Zi9Ga2ZRNTBPR3dsdnh4T0VVclFHeDRiQUhRWEdvMlZmVnkrYQp5Q0FPc3VXNjJNOGZSVWlYQlovRlJwNGx0VHl6S1BXeU1UOW1lVk55OWRDeDBHZ0s3cGVtVGxSVHJ3eFNnVGxZClZBTE11cFIyMnlLRGJLcEE5eVF5RUd4R29HYk1YS1BHZFFEMnNTVUNnWUJobnBIUnp6ZVRHYzFXL1hvdi9TQnYKYmZCL1VwUXFEV0dOYy9zTEpGNEViT2NNb21tb3pheTgvVWphYVprVEoxTWUvYlJSN3BwNmtrMHBBbjRzN0g4OQpVMkkzT3U2dlptSTVBTFBIWDVtYm16TWJqWnUydEJjSkJET3NEaXYvK3hMNTZSREZLYkdVR0FzUkh1MnpZeWx5Cm1PNE9ZSVlDWkIxL3hmOW00VkZ4d1FLQmdHaDJ1MDF4K0IxdktobUJLWTdMSXVhdjFCUnZ6c3I2N0hqdjZYcGkKamw5eUhENlJYQXdrVUxWNmdYc0I5K1dpbFJWVzdPekZtSlQydmhkVjNjbExhY1JoQi80bDVUL0I3TFF0bFVaZwprN1FEZFI2d0hLdkFocGN5SDdlNWE2akw2UW9zRGdNM2g0eWxMRzdqaGJUNnhheVRMc3JNR0NUMXlKWExxdWZ2CjNhMTVBb0dBRU1aNTRIR0VVWTNCQjVZbFg3NmVaWEIxNXV5Vm5EdkZka0Vpd0xrRXdOaWFFd0cvbHY3aXMwZTIKVmJsY2M0bGxuN0o1Qm9HaHBPdHhFKzhqOWliZEdaeGNLRXpHUUQ1WjIzOHhueFFpNHh1K0dRQ3dIK1UycXZyLwpFb2lMUmJQRC9IbEoyVHMxYzVKNUxaVmxMY0thTjRtT2QzN3VGQ1owU29tSWNEMUJ2RHc9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJYXF1bmZOK1N4WDh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeE1UQXlNekE0TVRsYUZ3MHlNREF4TVRBeU16QTRNakZhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXFmSitEZFNnYWhYN0RLYW8KZytRdHdjbFZCaEF1TGVLZzNMN2toOTBJTHF1ZnJta0tNbDFvTDZUN2lvTldMUFYzdGZYZGRtTWd4aTlTaUlzMwpkN3p4bms5WHBCVTNEcWpDSzlrN3BSRWc5bjhacmx0aW03L1FrMmlFZTkyRFF1U3lHL2c1VGNNT1NIUm5DUzVTCjUzaG1GRDU1MGpKYzhXSUZvWHQ2bFpwbHE5TzBvUE5YUkdoaEluejRueWFRUHBvUmF3eUh0V0VaZ2p0WEJJR1cKM3hNbU8wR1R3YTVKelFXRzdXQTlHTDMwZEpTbUpRaW84K1kyTXJIeXlIeXR0enJnSTB6Nm1kQ25WaU9hamdHdgpNanp6cXZBMlJMZFZhM1lDd0FlZzJZaUlVa0xjVUhKMUk3OXk5YnNXVU9RcmcyY0xwNUg4YVZlblpBVjFuMGQ5CjIvNkJPd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFKUWRBdEpFZVUzM3J0emxBaDFhZy9jZjFZaWw5c1Nobnk4dgpoS1kxR3N0WnBnTmFaZXJHM2tEMDZ3NUlPUnJiK1NlNnp3dkhtSmJHNDRyMy8wWWNFUm9HK2pDTW1MUDQvWW40ClVOVkhqREIxNmF4eENvVGlrd1NjYlBGVEpVUTkxMW5GRDBtS2hSZFFORHVWRU9TTWJVSEdVb2QvbEVhRTlXMmMKc3RFR0VhaHhySngwQUtBZ1Z5c3psTzR2ZGprOWhpMGgwWVZocFNZdnpZS0IvdnQ1VGliVExGZElhNG9TOWorSApDSE0zVlZFS0hIWi9PcmQ2VGZTdVZEeVRLU2I1bHhKVE9UaFlVMFQxUTNuV1pKRytDcHVjeC9yNk45eFhEdWVyCnJDZnhCeWh4OUNsQzA4b2F6L2VYcUxwR09zMlBVVXE2VE5xRWtJdjBhL3crTGkwbHFYcz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBcWZKK0RkU2dhaFg3REthb2crUXR3Y2xWQmhBdUxlS2czTDdraDkwSUxxdWZybWtLCk1sMW9MNlQ3aW9OV0xQVjN0ZlhkZG1NZ3hpOVNpSXMzZDd6eG5rOVhwQlUzRHFqQ0s5azdwUkVnOW44WnJsdGkKbTcvUWsyaUVlOTJEUXVTeUcvZzVUY01PU0hSbkNTNVM1M2htRkQ1NTBqSmM4V0lGb1h0NmxacGxxOU8wb1BOWApSR2hoSW56NG55YVFQcG9SYXd5SHRXRVpnanRYQklHVzN4TW1PMEdUd2E1SnpRV0c3V0E5R0wzMGRKU21KUWlvCjgrWTJNckh5eUh5dHR6cmdJMHo2bWRDblZpT2FqZ0d2TWp6enF2QTJSTGRWYTNZQ3dBZWcyWWlJVWtMY1VISjEKSTc5eTlic1dVT1FyZzJjTHA1SDhhVmVuWkFWMW4wZDkyLzZCT3dJREFRQUJBb0lCQUJ1YitKeVltWU1DbFNtRgovY1NIa21OMEtPcjJQL3BXWWhuYXJWZmhNYzRiTmJMby82NFUvTE1ZMDRDNk80ck1TaWwyaXdjTHJheGt6YnkvCkdVRExvbGs4dkprOGxSZzlsR1g1UWJaY1pRV0d1bzVYN0ZvdlBGeG1VM2VvRWdZUkQxcDU1aDFhL2Z3SlpSL1oKdGNCREVCcGoxL2l0RStwbktWRUZ0WEdPaHN2Mk1nQzRjOGJoZGxoaU1ZTkdmRGt2ZDRGS1ZBYyt3bGFZdm9SdApoTXZVT0NldjFtRkV3bnNBZHJCZ3JUclZXejhQR2M2NkZ4N0ZrR2l2U1pzaXg0Q1B2WEp4dkthSDkzYWpMY04xClZiUGdCNkt5SUt4Wi8xOWVUSDE3WHBha0hnQy9XQXk1c00xYWpGcmFucTh1Ym52RjljbmRuQmlvZ0JHVSt5UWwKRzA3ZUVLa0NnWUVBeDZjSzVHWEpEWmVrRjFMLzIrWVh4aGlYNERUWXkyV1lQeHRVeHIveXlnQWxDVDl4RkxFVgppcGt4S0gvc1BQYzZZMk94QmVUMGFmd0tGeVNYSEVHVW9YLzB6R3BVWXVLRmUwVVo4UElGbVJlVU1CbGZsTytlCjJwS3FqVHRaR2d2T1VjKytvRzIxMXJCb0J0ZDlCYThqaVdVbVdSVW95ZHN4RE9mNFBRdkR0VThDZ1lFQTJlazcKL2FVL01SRUdrUmt0WUhhR0U1NEJ5WEJiRUU4elNOWkFWT0xTcGozYVRCeDB3WUo4NUpPdEd6Sm1laVNBSEJpYQpCdXIxTHdGejhIUFNwMjJLWnJFRmNRdmNaWkg0WC84dTFxQnl0UDBwQkdjTmduYnhmU2UzYnZ4eU5kN1hBZWU5CkdXM0FlWDQyeFhoMllEcFlZOHlxY1ZXUU5CRnNvKzhvbW1FUVVsVUNnWUJxTEdjYWR4YW9aOUFYcDBmeGhUZDMKWFhUSEF0T1h0dnR6OC9EdGtQNW9kaE04QzhUeklBazRuNmNJeHA2Mi9UTEwwQ1EvNGpZb2RxUlhFbHBaNkhaRwpQR25PbTIwcytSSExNRUJQWmlXYitISVI4aXhtWTlleW5QU2VEc1dmbUUrc0tqSlIxb1l4R2JiNGpIZ3NJYXRnClVhNUhDWDJiZXpsbWg2WDNzTjN1K1FLQmdCNGF5THpyL1dUcjh6cE1maVpiZVg1d1Q5TGlnTklwL3UzTEc2d2UKZ2ZlUmgvMEgyV0Y2ZzRLWW5FdXJsTmkrL2l2amdqUCtkY3orcUdQSnZJcUE2YVB5Uk13dlZVMTY4eE5nRDdwNwpCQjNZODdlMS9QblBNT0dYZ1JJR01ra2E5aDAvUkxLa3BQaWo1VEUyeVRQV0c2djk5SFlmMmdJM2ZnalAyNDRvClpyYlpBb0dBSnBUSzhzOE9LeitzRlNMRlhGNUloZGNqbzJLSDhLZWZwbThKZm00NHNHRng3eHhmUUpRSW81UCsKRXZEQ1lLbWgxOUZLaTRqYm1jbXFqVTh3L3M3Nm5xOWJQNWxQOUl2SGh1UFdVV0RsRDE1ZVI2Ym0rekQybjByUgpCaCsrMWVKU0drRnJ3aXR2L3gwdXlRZWFXSXBROVdKcG9DRi9JcG93b0E1QmhQTUdWblk9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index c71cf61..6e77848 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,26 +1,31 @@
 ---
 # SEBA Values
 
-images:
-  envoy_for_etcd:
-    repository: 'smbaker/voltha-envoy'
-    tag: 'test'
+# images:
+#   envoy_for_etcd:
+#     repository: 'smbaker/voltha-envoy'
+#     tag: '1.6'
 
-  netconf:
-    repository: 'smbaker/voltha-netconf'
-    tag: 'test'
+#   netconf:
+#     repository: 'smbaker/voltha-netconf'
+#     tag: '1.6'
 
-  ofagent:
-    repository: 'smbaker/voltha-ofagent'
-    tag: 'test'
+#   ofagent:
+#     repository: 'smbaker/voltha-ofagent'
+#     tag: '1.6'
 
-  vcli:
-    repository: 'smbaker/voltha-cli'
-    tag: 'test'
+#   vcli:
+#     repository: 'smbaker/voltha-cli'
+#     tag: '1.6'
 
-  vcore:
-    repository: 'smbaker/voltha-voltha'
-    tag: 'test'
+#   vcore:
+#     repository: 'smbaker/voltha-voltha'
+#     tag: '1.6'
+
+# volt:
+#   image:
+#       repository: smbaker/volt-synchronizer
+#       tag: test-syncstep
 
 application_logs: |
   log4j.logger.org.opencord.olt = TRACE
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index a5fa408..f11ea76 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,40 +1,63 @@
 ---
 # SEBA Values
 
-images:
-  onos:
-      tag: '1.13.5'
+# images:
+#   vcore:
+#     tag: 'voltha-1.6'
 
-  vcore:
-    repository: '10.90.0.120:30500/voltha/voltha-voltha'
-    tag: 'dev'
+#   vcli:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  vcli:
-    repository: '10.90.0.120:30500/voltha/voltha-cli'
-    tag: 'dev'
-    pullPolicy: 'Always'
+#   ofagent:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  ofagent:
-    repository: '10.90.0.120:30500/voltha/voltha-ofagent'
-    tag: 'dev'
-    pullPolicy: 'Always'
+#   netconf:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  netconf:
-    repository: '10.90.0.120:30500/voltha/voltha-netconf'
-    tag: 'dev'
-    pullPolicy: 'Always'
+#   envoy_for_etcd:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  envoy_for_etcd:
-    repository: '10.90.0.120:30500/voltha/voltha-envoy'
-    tag: 'dev'
-    pullPolicy: 'Always'
+#   alarm_generator:
+#     tag: 'voltha-1.6'
+#     pullPolicy: 'Always'
 
-  alarm_generator:
-    repository: '10.90.0.120:30500/voltha/voltha-alarm-generator'
-    tag: 'dev'
-    pullPolicy: 'Always'
+#volt:
+#  image:
+#    repository: '10.90.0.120:30500/xosproject/volt-synchronizer'
+#    tag: candidate
 
 
+# in seba service chart
+fabric:
+  image:
+    repository: 'smbaker/fabric-synchronizer'
+    tag: 'test'
+fabric-crossconnect:
+  image:
+    repository: 'smbaker/fabric-crossconnect-synchronizer'
+    tag: 'test'
+onos-service:
+  image:
+    repository: 'smbaker/onos-synchronizer'
+    tag: 'test'
+volt:
+  image:
+    repository: 'smbaker/volt-synchronizer'
+    tag: 'test'
+rcord:
+  image:
+    repository: 'smbaker/rcord-synchronizer'
+    tag: 'test'
+
+# in workflow/att-workflow service chart
+att-workflow-driver:
+  image:
+    repository: 'smbaker/att-workflow-driver-synchronizer'
+    tag: 'test'
 
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE
@@ -42,4 +65,3 @@
    log4j.logger.org.opencord.sadis = DEBUG
    log4j.logger.org.opencord.aaa = TRACE
    log4j.logger.org.opencord.dhcpl2relay = TRACE
-   log4j.logger.org.onosproject.drivers = DEBUG
diff --git a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index e9b71d5..32505d3 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -22,6 +22,8 @@
   - custom_types/bngportmapping.yaml
   - custom_types/attworkflowdriverwhitelistentry.yaml
   - custom_types/attworkflowdriverservice.yaml
+  - custom_types/serviceinstanceattribute.yaml
+  - custom_types/onosapp.yaml
 
 description: Configures the EdgeCore SEBA POD with AT&T workflow
 
@@ -131,3 +133,26 @@
         - owner:
             node: service#att
             relationship: tosca.relationships.BelongsToOne
+
+    # 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:0000000000000001/48" ]
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#dhcpl2relay
+            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
new file mode 100755
index 0000000..fc701fb
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
@@ -0,0 +1,147 @@
+# 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-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/attworkflowdriverwhitelistentry.yaml
+  - custom_types/attworkflowdriverservice.yaml
+  - custom_types/serviceinstanceattribute.yaml
+  - custom_types/onosapp.yaml
+
+description: Configures the fabric and the whitelist
+
+topology_template:
+  node_templates:
+    switch#agg_sw:
+      type: tosca.nodes.Switch
+      properties:
+        driver: ofdpa3
+        ipv4Loopback: 192.168.0.201
+        ipv4NodeSid: 17
+        isEdgeRouter: True
+        name: AGG SWITCH
+        ofId: of:0000000000000001
+        routerMac: 00:00:02:01:06:01
+
+    # Setup the EdgeCore OLT switch port
+    port#edgecore_olt_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 1 
+        host_learning: false
+      requirements:
+        - switch:
+            node: switch#agg_sw
+            relationship: tosca.relationships.BelongsToOne
+
+    # Setup the Adtran OLT switch port
+    #port#adtran_olt_port:
+    #  type: tosca.nodes.SwitchPort
+    #  properties:
+    #    portId: 50
+    #    host_learning: false
+    #  requirements:
+    #    - switch:
+    #        node: switch#agg_sw
+    #        relationship: tosca.relationships.BelongsToOne
+
+    # Port connected to the BNG
+    port#bng_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 109 
+      requirements:
+        - switch:
+            node: switch#agg_sw
+            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: 109 
+
+    # 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:0000000000000001/109" ]
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#dhcpl2relay
+            relationship: tosca.relationships.BelongsToOne
+
+    # ONU Whitelist
+    service#att:
+      type: tosca.nodes.AttWorkflowDriverService
+      properties:
+        name: att-workflow-driver
+        must-exist: true
+
+    # ONUs connected to EdgeCore OLT
+    ALPHe3d1cfde:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1cfde
+        pon_port_id: 536870912
+        device_id: of:00000000c0a8646f
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    ISKT71e801a0:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ISKT71e801a0
+        pon_port_id: 536870912
+        device_id: of:00000000c0a8646f
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    # ONUs connected to Adtran OLT
+    ADTN17510028:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ADTN17510028
+        pon_port_id: 5
+        device_id: of:00000024454a6be4
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
diff --git a/tosca-configs/att-workflow/onf-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
new file mode 100755
index 0000000..35b1607
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
@@ -0,0 +1,49 @@
+# 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-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
+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.111
+        port: 9191
+        switch_datapath_id: of:0000000000000001
+        switch_port: "1"
+        outer_tpid: "0x8100"
+        uplink: "65536"
+        nas_id: "NAS_ID"
+        serial_number: "192.168.100.111:9191"
+      requirements:
+        - volt_service:
+            node: service#volt
+            relationship: tosca.relationships.BelongsToOne
+
diff --git a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
new file mode 100755
index 0000000..dfea33d
--- /dev/null
+++ b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
@@ -0,0 +1,63 @@
+# 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-demo-pod-subscriber.yaml http://192.168.100.1:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/rcordsubscriber.yaml
+
+description: Pre-provsion subscribers
+
+topology_template:
+  node_templates:
+
+    # EdgeCore OLT subscribers
+    edgecore_alpha_subscriber:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ALPHe3d1cfde
+        status: pre-provisioned
+        c_tag: 11
+        s_tag: 111
+        onu_device: ALPHe3d1cfde
+        nas_port_id : "PON 1/1/03/1:1.1.1"
+        circuit_id: edgecore_alpha_circuit
+        remote_id: edgecore_alpha_remote
+
+    edgecore_iskratel_subscriber:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ISKT71e801a0
+        status: pre-provisioned
+        c_tag: 12
+        s_tag: 111
+        onu_device: ISKT71e801a0
+        nas_port_id : "PON 1/1/04/1:1.1.1"
+        circuit_id: edgecore_iskratel_circuit
+        remote_id: edgecore_iskratel_remote
+
+    # Adtran OLT subscribers
+    adtran_subscriber_1:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ADTN17510028
+        status: pre-provisioned
+        c_tag: 21
+        s_tag: 222
+        onu_device: ADTN17510028
+        nas_port_id : "PON 1/1/05/1:1.1.1"
+        circuit_id: adtran_sub1_circuit
+        remote_id: adtran_sub1_remote
+
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig.yaml b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
deleted file mode 100755
index 1e47e3d..0000000
--- a/tosca-configs/att-workflow/onlab-pod1-cig.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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 @onlab-pod1-cig.yaml http://10.90.0.101: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/attworkflowdriverwhitelistentry.yaml
-  - custom_types/attworkflowdriverservice.yaml
-  - custom_types/rcordsubscriber.yaml
-  - custom_types/switch.yaml
-  - custom_types/switchport.yaml
-description: Create a simulated OLT Device in VOLTHA
-topology_template:
-  node_templates:
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      properties:
-        name: volt
-        must-exist: true
-
-    # CIG
-    olt_device:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: CIG
-        device_type: openolt
-        host: 10.90.0.115
-        port: 10400
-        switch_datapath_id: of:0000000000000001
-        switch_port: "4"
-        outer_tpid: "0x8100"
-        uplink: "65536"
-        nas_id: "NAS_ID"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-    # Whitelist
-    service#att:
-      type: tosca.nodes.AttWorkflowDriverService
-      properties:
-        name: att-workflow-driver
-        must-exist: true
-
-    CIG:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: CIGG70606829
-        pon_port_id: 536870913
-        device_id: of:000000000a5a0073
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
-
-    # Pre-provision the subscriber
-    cig_subscriber_1:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: Sub_CIGG70606829
-        status: pre-provisioned
-        c_tag: 444
-        s_tag: 444
-        onu_device: CIGG70606829
-        nas_port_id : "PON 1/1/03/1:1.1.1"
-        circuit_id: foo1
-        remote_id: bar1
-
-    switch#leaf_1:
-      type: tosca.nodes.Switch
-      properties:
-        name: AGG_SWITCH
-        must-exist: true
-
-    port#cig_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 4
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#leaf_1
-            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
new file mode 100755
index 0000000..8e0daf5
--- /dev/null
+++ b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
@@ -0,0 +1,47 @@
+# 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 @onlab-pod1-edgecore.yaml http://10.90.0.101:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/oltdevice.yaml
+  - custom_types/onudevice.yaml
+  - custom_types/voltservice.yaml
+description: Create a simulated OLT Device in VOLTHA
+topology_template:
+  node_templates:
+
+    service#volt:
+      type: tosca.nodes.VOLTService
+      properties:
+        name: volt
+        must-exist: true
+
+    olt_device:
+      type: tosca.nodes.OLTDevice
+      properties:
+        name: ONF OLT
+        device_type: openolt
+        host: 10.90.0.114
+        port: 9191
+        switch_datapath_id: of:0000000000000001
+        switch_port: "1"
+        outer_tpid: "0x8100"
+        uplink: "65536"
+        nas_id: "NAS_ID"
+      requirements:
+        - volt_service:
+            node: service#volt
+            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index bcfa161..c0a33f9 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -44,4 +44,4 @@
       requirements:
         - volt_service:
             node: service#volt
-            relationship: tosca.relationships.BelongsToOne
+            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index 382d8b4..5ff15fa 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -121,3 +121,47 @@
         - owner:
             node: service#att
             relationship: tosca.relationships.BelongsToOne
+
+    ALPHe3d1cf8e:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1cf8e
+        pon_port_id: 536870912
+        device_id: of:000000000a5a007a
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    ALPHe3d1cf9d:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1cf9d
+        pon_port_id: 536870912
+        device_id: of:000000000a5a007a
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    ALPHe3d1ced5:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1ced5
+        pon_port_id: 536870912
+        device_id: of:000000000a5a007a
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    ALPHe3d1cf70:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1cf70
+        pon_port_id: 536870912
+        device_id: of:000000000a5a007a
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onlab-pod2-olt.yaml b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
index f712a1a..7167318 100755
--- a/tosca-configs/att-workflow/onlab-pod2-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
@@ -41,7 +41,8 @@
         outer_tpid: "0x8100"
         uplink: "65536"
         nas_id: "NAS_ID"
+        serial_number: "10.90.0.122:9191"
       requirements:
         - volt_service:
             node: service#volt
-            relationship: tosca.relationships.BelongsToOne
+            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/tosca-configs/bbsim/bbsim-16.yaml b/tosca-configs/bbsim/bbsim-16.yaml
index 0d27f4b..bab7fb4 100644
--- a/tosca-configs/bbsim/bbsim-16.yaml
+++ b/tosca-configs/bbsim/bbsim-16.yaml
@@ -12,7 +12,7 @@
 # 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 @onlab-pod2-bbsim-16.yaml http://10.90.0.120:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @bbsim-16.yaml http://10.90.0.120:30007/run
 
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
@@ -39,7 +39,8 @@
       type: tosca.nodes.OLTDevice
       properties:
         name: BBSIM_OLT
-        device_type: bbsimolt
+        # device_type: bbsimolt
+        device_type: openolt
         host: bbsim.voltha.svc
         port: 50060
         switch_datapath_id: of:0000000000000002
@@ -65,7 +66,7 @@
       properties:
         serial_number: BBSM00000100
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -76,7 +77,7 @@
       properties:
         serial_number: BBSM00000101
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -87,7 +88,7 @@
       properties:
         serial_number: BBSM00000102
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -98,7 +99,7 @@
       properties:
         serial_number: BBSM00000103
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -109,7 +110,7 @@
       properties:
         serial_number: BBSM00000104
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -120,7 +121,7 @@
       properties:
         serial_number: BBSM00000105
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -131,7 +132,7 @@
       properties:
         serial_number: BBSM00000106
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -142,7 +143,7 @@
       properties:
         serial_number: BBSM00000107
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -153,7 +154,7 @@
       properties:
         serial_number: BBSM00000108
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -164,7 +165,7 @@
       properties:
         serial_number: BBSM00000109
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -175,7 +176,7 @@
       properties:
         serial_number: BBSM0000010a
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -186,7 +187,7 @@
       properties:
         serial_number: BBSM0000010b
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -197,7 +198,7 @@
       properties:
         serial_number: BBSM0000010c
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -208,7 +209,7 @@
       properties:
         serial_number: BBSM0000010d
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -219,7 +220,7 @@
       properties:
         serial_number: BBSM0000010e
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -230,7 +231,7 @@
       properties:
         serial_number: BBSM0000010f
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
index 63a3f44..ee1cc21 100644
--- a/tosca-configs/bbsim/bbsim-2.yaml
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -39,7 +39,8 @@
       type: tosca.nodes.OLTDevice
       properties:
         name: BBSIM_OLT
-        device_type: bbsimolt
+        # device_type: bbsimolt
+        device_type: openolt
         host: bbsim.voltha.svc
         port: 50060
         switch_datapath_id: of:0000000000000002