diff --git a/deployment-configs/comac-onf-testbed-kubespray.yaml b/deployment-configs/comac-onf-testbed-kubespray.yaml
index 4f60bbd..20479ee 100644
--- a/deployment-configs/comac-onf-testbed-kubespray.yaml
+++ b/deployment-configs/comac-onf-testbed-kubespray.yaml
@@ -54,4 +54,4 @@
 
 helm_enabled: true
 helm_deployment_type: host
-helm_version: v2.14.2
+helm_version: v2.15.0
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 834920a..1a431e3 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -20,14 +20,22 @@
 
 nodes:
   -
-    ip: '192.168.100.1'
+    ip: '10.128.100.70'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.71'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.72'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
     mac: 'cc:37:ab:61:80:ca'
-    ip: '192.168.100.101'
+    ip: '10.128.100.80'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -37,8 +45,37 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.111'
+    ip: '10.128.100.90'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
-    serial: 'EC1838000853'
+    serial: 'EC1904000654'
+
+onus:
+  -
+    serial: 'BRCM22222222'
+  -
+    serial: 'ALPHe3d1cf9d'
+
+hosts:
+  src:
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens6f1'
+      container_type: null
+      container_name: null
+      onu: 'BRCM22222222'
+      c_tag: '11'
+      s_tag: '99'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens6f0'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cf9d'
+      c_tag: '22'
+      s_tag: '99'
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 37306d2..3d274d4 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -38,6 +38,9 @@
     ip: '10.90.0.111'
     user: 'root'
     pass: 'onl'
+    bngPort: '31'
+    oltPort: '1'
+    device_id: 'of:0000000000000001'
 
 olts:
   -
@@ -45,14 +48,15 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
+    serial: 'EC1721000216'
 
 onus:
   -
-    serial: 'BRCM22222222'
+    serial: 'ALPHe3d1cfde'
   -
     serial: 'ISKT71e801a0'
   -
-    serial: 'ALPHe3d1cfde'
+    serial: 'BRCM22222222'
 
 srcHost:
   ip: '10.0.3.56'
@@ -61,10 +65,26 @@
 
 hosts:
   src:
-    ip: '10.90.0.51'
-    user: 'ubuntu'
-    dp_iface_name: 'eth1'
-    container_type: 'LXC'
-    container_name: 'ALPHe3d1cfde'
+    -
+      ip: '10.90.0.51'
+      user: 'ubuntu'
+      pass: null
+      dp_iface_name: 'eth1'
+      container_type: 'LXC'
+      container_name: 'ALPHe3d1cfde'
+      onu: 'ALPHe3d1cfde'
+      c_tag: '112'
+      s_tag: '111'
+
   dst:
-    dp_iface_ip_qinq: '8.8.8.8'
\ No newline at end of file
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: null
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      dp_iface_ip_qinq: '8.8.8.8'
+      container_type: null
+      container_name: null
diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
index 993a676..e672573 100755
--- a/kubernetes-configs/onf-demo-pod.conf
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -1,19 +1,19 @@
 apiVersion: v1
+kind: Config
+current-context: admin-cluster.local
+preferences: {}
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1EZ3lNakl3TkRJeU9Wb1hEVEk1TURneE9USXdOREl5T1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTDNDCi9WbXU5amtEcmVEVlBRNnZNeEVCQnlKTDZkcHU1Nng5UG82YWNlK0V1ZlhjZ1hGWHZnczZpbmZqZzJXMzZpWXcKeFVTeXBtNlNUVEFRcWFYMmV1RDB1NnY2QXZNRitQK2YxaStEejFrZTE3SWFPSGpwenNUVjZjWXg5dGs0a3kyRAppbW1jUWRzOHNUVVJ4MHJUV2RLR0NuL2JqZmE4dTJTaTZXelQvMGhTWFNUWU9ra00zYmhFNkE5MGQ1Nk8ySVRhCk5JaVNBaHYwNTI4RFUzM1B1QTFBcjNiRmdqNWg0NkQwT0llRGhkUi95TzlGbDBxUEsyRDB4dWNvMFduWFMycGsKTlFtbjQxSFFrRkU2WWF6K3R6NWdSem5MTldCTDJBUGFSaGhtcllvOThpVENKUUd5VUxIdi82Z2t1YmZsSkZpeApEKytCZXlBN0sreHpTL3l1ckNNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJNlRpTFdiR2JHWFNJcUNQMW9LKzVqQ2kwY0kKWlVpemw4M0crY0hPMmF2MTJUcy80VkRwSCtVNzRHNU5YdUl5QmRXS3lvbFlrQlFzU2FoaUtzRG5IelpESWFFWApQdW5SRGF1Uld2cklEaGk2YW1ycUhycmE1Yks3a29ENzR6aFRNNzQrekk1eGV5Vk00ZnJTTVBHRHV1VnlxWTFSCm1nY0h2Vm9hTENGcmpMeWIyWHNBaFZaODc0MkhuOHZ1ZmNaMlNXWVlTQzZZa2t5RG8zSDFELzhMRCtaSVRtVXAKdnd1c1MvZ2dWY2FiK1RJSE9vZDQ1bUtmS3QxQnc4ZEhkWmsxK2diWjluNS9XSUdWWG9VUlByNVkySFEzUmhlbApqMXV6MjI3dkRmVW1kVTR6QW5EZnk2dUF1SU90S1dHc2RRYWhFTjhVQXVNcU5FWEhON21iOXdkTnV3az0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://192.168.100.1:6443
-  name: kubernetes
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQU1xVDc2cnduVFdoTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt4TURJek1EQXhNekl6V2hnUE1qRXhPVEE1TWprd01ERXpNak5hTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRQzg0V2s4NjI3RFY4cXA5MmdaMDVuL3p5UTNrcGgrYW8reVI4RW5COVJQVUh2cXluUHpNS2xibzd5cE1LN2QKU2JjT3lLb1B4cEtTL2plYkVvUDE3QXJKRDh0d0Fibnh3dmtyN0pmY2o1dG9PcFY4YVdLSkt2N3dCaDVLUHJlMApsL3YvYTYxTlV3YTFjOFdqTmFoQXA2MENCMUdGTlNOWjY3bnNsbnkyQXhNSStNK0tIcWF1R0FkL0Z2aVE2NFo2Cjg4Y3E2ZEIwUTQyVm1tS0M1b2lZa2l3c0R2VHlWbGY3bHhVdWlPeTRsSWxUQmdxRHBGNVJadlFkR0ZJM3hmL0EKN2FlbmRFYkJrQm5jZUM1VkhnaEpuZWZSS3BKQWpjVmN3cUQvUUJkcFgrN3c4T2U0OXBPVlpnd3hoZ0h1cXNHVApaNWtlNUt1T0Z0aUMvd3gvRURaL1NYdUxBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlJFam9kYzdXUTAyMjg4ClMwOUJoY0NVYk1jWWpqQWZCZ05WSFNNRUdEQVdnQlJFam9kYzdXUTAyMjg4UzA5QmhjQ1ViTWNZampBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFDTVhNNXoyQzlWaUNnazBkdlo0YSt5NWhzLwo0U21ubEY1WHUvMXJ3eklkVWtDWkwyRkZramZ3QlFJMjhkNFV0cVhVbDhVRWR6c092QXlTWDlzU2UzRVNFZnFCCkFiVW5CWXJaMTBmWGNDVlErR2JZV0sySjVSSEl0NHFGdmFzZ0JQOVplQVdkMlZJUUFCanF4bnFYYmV1Q0RwV24KdWRqcTBrZEdnekpNMUdITnNwN282L2VVazQrN0tKTUlINkZKR0JpeGdpSVZwNkJ6V2RlNmFtQzVPNzB4S0ZwZAo4alZ2QUZ2MmJQeVY2Tk1MZk9vazJvbGN1REE5aHp6WWh0cUxzUkFiL3gxK1dqcm1qZFJpN296dHhWSHBLTEQ1CmJiNXVxelU3bTRrbkdOVFdOcEU3NHd3WlFHVXdzeG1sZkxoeExRUTZ0L2dEN2NINE92STR1QmM4TTlrRAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    server: https://10.128.100.70:6443
+  name: cluster.local
 contexts:
 - context:
-    cluster: kubernetes
-    user: kubernetes-admin
-  name: kubernetes-admin@kubernetes
-current-context: kubernetes-admin@kubernetes
-kind: Config
-preferences: {}
+    cluster: cluster.local
+    user: admin-cluster.local
+  name: admin-cluster.local
 users:
-- name: kubernetes-admin
+- name: admin-cluster.local
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJQUwvcmJtT2ZpNjh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBNE1qSXlNRFF5TWpsYUZ3MHlNREE0TWpFeU1EUXlNekJhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXpvby9TUE1mSXNLaEdCT2oKbXlRNFRWanFaS1Y5SWJjRkovL0NWSjZvK2VqbUZoSUV5bWp4M1NFV1ZNM3kvN3Z2ZU9IYmdxU0svazRwbi9EYwp6Z1dwcjFlNDZEbWRkMFduTDI5eUJMUjlWTUNaeUJjY0VweDFOcDdEWG5mc2VrU0dGclY0eGdINnBzTHlLZE5aCk56NmxpNjFXZFp2cWxMVDg0STBwNmlLN29LUkNuODNtQjZjTXhCWUFlem9XaUk4Nmc1d2FuZlVPdlA2TEZWMUcKUzFWUjFnem9pRlExdGVuWWdyVFZDK2hQU3d4azZkVUp0UWpGVWdxWlhrZVR3ZVZUWi9BUkJtVjg5aFcwcDFuLwp3VWgreHVnN3VVVEZEL1FJa1Y1bkdRUHh6Y3BxT3E0VmRJR0k0QmFCMTJpeTl6dXVvVTYzS3ZhbEZuYWQzcGxlCkoxZTkxd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFGRXN4UC9KZkpjSjAzUm5VbU5sa1RFYzdRWHlVOTRsam12eQpON0VHem9sWGZuSkFxL3lOWUgxTmQzdys2bEFiZXRRMjdCSzBKc1RhUWNzWDE4ZC9tc1VQQmFsUWZWRzBIREU2Cjhod3pEZk5OeHB0NXNCNklRanh2ZEx2OENsN1AwWktFRGJIOWdqTUJvRUJJSDZiK3Zzem9oTnhaS3NiTjUvZG8KSmM4cnNDS3UxV2ZJU0hjbFFYWGpJQkg0bG5LNjdKbW03NDcvWVVGZ0dhQlNlVTJ5Z0YxNGFnblJnWE8rQ2UzZQpGZkR2RHNnQ21Xa2lUb3k0bWtxejBiODNrS1RQWGJ6SHhqblhVeXZZT0NOT2tPTXIxTXM4cis4cFVlNDFadnlHCjEyOG1oaHhDM21ET3VwZWpsdmFJNmdLdysvYnprdzI3dWFTUkpCMjZCL0dQYjY0Qk5Ldz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBem9vL1NQTWZJc0toR0JPam15UTRUVmpxWktWOUliY0ZKLy9DVko2bytlam1GaElFCnltangzU0VXVk0zeS83dnZlT0hiZ3FTSy9rNHBuL0RjemdXcHIxZTQ2RG1kZDBXbkwyOXlCTFI5Vk1DWnlCY2MKRXB4MU5wN0RYbmZzZWtTR0ZyVjR4Z0g2cHNMeUtkTlpOejZsaTYxV2RadnFsTFQ4NEkwcDZpSzdvS1JDbjgzbQpCNmNNeEJZQWV6b1dpSTg2ZzV3YW5mVU92UDZMRlYxR1MxVlIxZ3pvaUZRMXRlbllnclRWQytoUFN3eGs2ZFVKCnRRakZVZ3FaWGtlVHdlVlRaL0FSQm1WODloVzBwMW4vd1VoK3h1Zzd1VVRGRC9RSWtWNW5HUVB4emNwcU9xNFYKZElHSTRCYUIxMml5OXp1dW9VNjNLdmFsRm5hZDNwbGVKMWU5MXdJREFRQUJBb0lCQVFDUXJxMTRWNzhtNVhwZAoyRndTY01QMEF1Wm5UTG9rWlFYNnFDSWtqdVJGOUkxQlJxd09jb2VEWlFzMHF2U2ZpckpOVnNJamVVcFlyTDVoCjZTTjBPdWxNQ0VKaWd3RzRySlZhR0ZLaDB5Rzh2aEs3NU54b2VTdHU4TFpoTmRiMUs0MVcyUmJhZGtaMGpUbUEKYlNvaEZnUjNuUnhrMUt6Mk1QYTRBb3NyRmR1andrbkVmSStPdFlNWkZvZExwOWVyaVJZeHFOc2FEOFg5OE9LVApVM2dDcGpqNTlUUmRLMUgwczNqK3IvQityQTBXS2lneEYxT0JBenNIV214RmlSR1FEWDRNNG9icU54NUpQTk5ECkgzUWtrVUVNK1FVRnRESDdSNHl2bEZVR2pBMnhwVGxRNENrbndrRCtiL0NkZCtoMnkyMVJhdm5RcEE2dUhoWGgKUHlBa1dOdTVBb0dCQVB5N0J1aFBHbmNJeWtLa2lHQWRhWVNRcEtOUllaOHZMSDlwYkJ3eUZjcDcwLzNQQm0rdwpCZ0FEMHliOVl1WTY2bklKdC9OcCs3a2pMRUJZYWZMdTRJY2ZzWkRRR21QMmphTGNzYlBCd1lEWS9ZVzcyN0I5CjNSTVBUNy9SQlNBSi9hbU0rTjR3UnFHRVgreGI0ZTZWNVJ4NkVMNUFvemJYRHZHbEh3N1Fsb1N6QW9HQkFORTIKUUFNZUFNYzc5VytSdy9IeFlVK3FWZk9JWjNqcG16SFozaWMwTW1ZVDlIdStSaVQvWCtRYXY4MmRhTktEcGhrbgpycEFCQ2ZWSE5rRDZkZDFsL2RyZmhrajFYbkJaSG5FQU03OEh6TjFMdjN2ZFZ4cXlRWS9PeFFRRlAwdlVvbzFECjFhV3RPL0U2M1NqOUh3RXczVXhMZjBrZTQybkdTTnBUdkg0RDJOeE5Bb0dBR3hjdE1WK3hWWXNpcXl3WjFqdXcKNE4za1dBRlVObzBHOXcxazRrellHeUZVNHdMN0RLUFFzTlc0SDVqUHJpQW9tMXJCVmgxSk4xbzIxeHJqR0lCVQpud2Rkc0VrdVd3TEZ3ZXhvTy8yTDhYVFJFREhINWM1SUVVLzEyM2piVk1qZFlQeFVmUFN0elloMEE5RUJrZUtOCmNaVUFFSFM3U2hpWmFIdXJyWm5jV0pNQ2dZQk1JUm1hQ01qdnR2blE1NUlOOEhBZ3RUTWhzM2t6bm81Q3phengKUnlVdjBBTWZKRllTRUh1c1hhOTkrdEd5Q1FYZ0VYaU1IbFNwVklpQmpLSm5OajN4NzNUR0I4T2R6bEF0Zm8xVgo3bGkyRG1KWGlHdXg0enZJUU0yZ2NPaGZoN2krL3ZnM21abytaZFVrblRjekQ3ejNqbUY3RWlwZXl6Q25nZUVOCldna0g0UUtCZ1FDMUNWTWU2YzZWSWRhR3FHNFVXL25pQ2lMOGxSNmJvN1I0dElZMituZXZxRzFTYWpUQ3dkRVYKOEV0Wk9QWmVQdG12c0c1VzVNQlBPSjRselIxNHUyYWJaU1Zqa2c3ajNOZXU1d0dTUnZKU3haYjFuSUZldVNNYwpJcy8zc2ZKUzVxUkZCbDBkTXFYL2UxbDh0bEdyeWxpYmh3ZSs0RnlhYWp0WWVrM1cyRGc4SEE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURvekNDQW91Z0F3SUJBZ0lKQU1uYkRTTFdNWDJDTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt4TURJek1EQXhNekkwV2hnUE1qRXhPVEE1TWprd01ERXpNalJhTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQW4wNUltc3NxN1RpbkM3eGQKbWorWTV4OENvU1VuUXNBNEhxamx5Y3ozQjNTdWdJVUxrN3EwSlpueHppTEFKK0l2TldDUWw2RlpzU0hSSDhKVApWQ3pYdGdNZnhYLy9pcURJVmdTekluc2lzei9wSXlucTRtRXA2OTlUeU5UYzcvZi9VWjJjWi9WZDV0RGdsczdZCkhnZmVGQ1VBekRMcWxaOXZkdUh1NUc5VityU0hrMVVBcWQrN2xGOUd2S0hqeHdCNmcxMWpuT0ladjRBazZ5RUoKOXFacHN4ZE9OSkVHakxoQXZDdDVvQnYweFhSUlNsK0JaWFluaU5JcEpuRHJqb3hIc0todDlUaysxTktQRElRTwpqUTBHSjJicEhlQmRBOFFZT0VKa3NhcnRxVjlINHVaWWhyUWZ5T2M4YW43WWJOQVJEcW9nQzRXdjVCSDhtNXZqCmhDVCt1UUlEQVFBQm80SFhNSUhVTUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUc1QmdOVkhSRUUKZ2JFd2dhNkNDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnZ1Z1YjJSbE1vSWRiR0l0WVhCcGMyVnlkbVZ5TG10MVltVnkKYm1WMFpYTXViRzlqWVd5SEJBcUFaRWFIQkFxQVpFZUhCQXJwQUFHSEJIOEFBQUV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFLRTFsaGJZV2kvaWlLaGFocUNnZk5VaC92dzBabXFiTlVRRzNrU2wwd3UyRlRYd2I4Vm1tUkp1CkY0d3paanRPZXlPWHBzVmxUUkJRM1hkc1ZvVXUvSjNFcURWTytPR0Q3dXkrQ2VzYVhKbDAxQXVUd0pmZFYzMTgKRWI5WnlKVHZpcnZ1MEcyWnRLZ0RrQnN3cWR0RzhMUXhEdHFBbnNWalBUVEd6dXRua1hwbDhZb21qeWtZV0JiVAo2a1k0cjR3Y0hBK1F4UFVuOTE3dXk2b0labzllOVpkcW03Qzl4Qk5zTTgva2grZGc3bmFwRTF4djdTZ1gyS3BCCkMvWXphTWlIZVNabVRrZTFzK2Q1eXJJVVJ3WGs2QWR4Sm5NZmRnZk91SEppdGtOWXQrWWhqK1VvaWxEUVlxK1oKM1ZzTUtKVEZtZTdXSVV6b0lBTEIxM3d4MHQwNUJBRT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBbjA1SW1zc3E3VGluQzd4ZG1qK1k1eDhDb1NVblFzQTRIcWpseWN6M0IzU3VnSVVMCms3cTBKWm54emlMQUorSXZOV0NRbDZGWnNTSFJIOEpUVkN6WHRnTWZ4WC8vaXFESVZnU3pJbnNpc3ovcEl5bnEKNG1FcDY5OVR5TlRjNy9mL1VaMmNaL1ZkNXREZ2xzN1lIZ2ZlRkNVQXpETHFsWjl2ZHVIdTVHOVYrclNIazFVQQpxZCs3bEY5R3ZLSGp4d0I2ZzExam5PSVp2NEFrNnlFSjlxWnBzeGRPTkpFR2pMaEF2Q3Q1b0J2MHhYUlJTbCtCClpYWW5pTklwSm5EcmpveEhzS2h0OVRrKzFOS1BESVFPalEwR0oyYnBIZUJkQThRWU9FSmtzYXJ0cVY5SDR1WlkKaHJRZnlPYzhhbjdZYk5BUkRxb2dDNFd2NUJIOG01dmpoQ1QrdVFJREFRQUJBb0lCQUFDY01TVCtvRFIyWWhWbQpiRWxaOHdEM21tLzVqM1B1L29nSGg1SEZTakRxSG56NWhYalVYenBCbzY1eGJhRDVlY3JQaXQ0NXpQa2pzd1JYCkh6Q1VWMk1vRWVnVXZHclFnTlByZ3JBZ0hwcm5KTUp3dDZpVVRLL05sQ21SdnlMZ0pVY3Z2bGlibFBkOFYwL2MKalBGWWdGNDlZZ3BtSzRYVkxYMGNFbWtua0FHOHk3Zmw4UnYzaUVITFRSN3NMekpqWHAwMk1wMys2bFlXK0NHagpNK0t1NFUvWGZORHZ3UGVXR04rNnZndWFrd29FV3RELytZNHZMODJreWIyYWdaMTRTZUVBY1NBVHVnSmdvQUtSClVYY3lNV1FMN2xQT2JodUhTOXdIU2oxbVBXbWJPUlc1RFFJR2dPckpsK3NEcllqdmxFbkdCVmJHUWtHWXc2WngKN0xwcTQ0MENnWUVBMFBELzFJb0k3N0hRczZ5WWdZWkhmUTZvOGpiNlVaWWFBZG5wb245VlM1aTdvQ2Uzc3Z3bwoyRHhYM3F5SjIwTmNDQUVRazFlSWd4Vk5ZdlMzUnU3U0R0ZTh2ckJHOXhUL2RIRnh3Mm5GQ3ZuL004cVQ1N1dxCnBZcXFsVlhIa0Nac2Ivc2xRQjNPa1A2dmMzY1k0cEd0R3ZPcmNGaWhwL004cTk5YzY4d1hqaHNDZ1lFQXd5OXQKcEpGcWROdmVOd3FnTmMvMEpLUFFKOFEyL3p0eUpvY3Z1emROQ3dJVnAzK0V4WExxdTBvcGdoN0xsRkM4cWRFcgpyNjFNZ2ZKbjB3M0dyZFBYY2FxeWNJWmZVdHpCWHI1dkVvU0ZtUVZNenhkZTU1UVAzM3B4ekoyeGxMNTV5YTZBCkdGVC9IVWdxMDR6TWFZQS9TbVluWGxCZVkrR0RlRXg5QVpHdm83c0NnWUFuc3VLbzIyRS9TYVhCdmJWc1Jyc20KZzdhTjd1dzR2REJNMGI2V1pXTXJiZVdZVkhPT3ltSm9VMjdPbkRIRk8xTXRJaWFvR0NXVDRtUkZ2UUZsdE5LcwpoMGtSWWlUWnBWKzBIQ25sV3g5WktvN1dwRkxkMzZLQXVZd1h1NmlqTnVtN2pSaFN5bGNKTFpyZ2NXeUUvL0RJCkFpdzh1RnBlc3RTQVEzeEFRUkxvcVFLQmdRQ2JDcCtUYTVjZWdGQUJkTVZTT1g5N1kweERhazh0YXJELy9iNWkKZmtrS2gzdGY4NkVwbm1EcXFMeFVDZFk0Vi9HbEN1d2l2Z3ZaNVEybnpuZVZPSU1ZWFRra3ZQZ1hRQmV5Qko4QwpISlpxdUpVTW8wblZ0Znp0emJ0N2gzKzU0WnVvSXA3SnRTcDR2Z3lXd203VkZ2UXZTdm5XcHd4elZuMHlINy9rCmNTOE5aUUtCZ1FDL3AxOENwSVBzWkxLZVFPbDBGNGlsRm02Z003QXRNRlNMd3NMdmgyVlFQNTJVMkFWQThSVTYKeit5VEFjVVlSODd5WDljK2V3QlBSbCt2bUw2THFxeC9iU1Z0bWZUMGJ5ajlhaWtQYzRZQ2x6K3Ywd1E3ZWg5SApPcjV2K0RLdmFoYW1CNG5scThoU2M3Z2VjcUZYbithUDI0N2wzeGt3dDNmNUtwVGhxTlhoZGc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index f28640d..9232d21 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -13,26 +13,14 @@
 # limitations under the License.
 
 defaults:
-  image_tag: voltha-2.1
+  image_tag: master
   image_pullPolicy: Always
 
 images:
-  adapter_open_olt:
-    tag_go: voltha-2.1
-    pullPolicy: Always
   onos:
     tag: dhcp-fix
     repository: matteoscandolo/voltha-onos
     pullPolicy: Always
-  bbsim:
-    tag: 2.0.2
-    pullPolicy: Always
-  afrouter:
-    repository: voltha/voltha-afrouter
-    tag: master
-  afrouterd:
-    repository: voltha/voltha-afrouterd
-    tag: master
 
 deployments:
   etcdOperator: true
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index 1ae6459..d6fd241 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -16,7 +16,7 @@
 # Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
 
 defaults:
-  image_tag: voltha-2.1
+  image_tag: master
   image_pullPolicy: Always
 
 images:
diff --git a/kubernetes-configs/voltha/onlab-pod1.yml b/kubernetes-configs/voltha/onlab-pod1.yml
new file mode 100644
index 0000000..9232d21
--- /dev/null
+++ b/kubernetes-configs/voltha/onlab-pod1.yml
@@ -0,0 +1,47 @@
+# 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
+
+images:
+  onos:
+    tag: dhcp-fix
+    repository: matteoscandolo/voltha-onos
+    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/voltha/onlab-pod1-onos-netcfg-switch.json b/tosca-configs/voltha/onlab-pod1-onos-netcfg-switch.json
new file mode 100644
index 0000000..42a4c20
--- /dev/null
+++ b/tosca-configs/voltha/onlab-pod1-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "Leaf-R1",
+        "ipv4NodeSid" : 101,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}