diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 7ae4e17..2ea8e50 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -38,7 +38,7 @@
     ip: '10.90.0.224'
     user: 'root'
     pass: 'onl'
-    bngPort: '3'
+    bngPort: '31'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -48,7 +48,7 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
-    aggPort: '10'
+    aggPort: '1'
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb
@@ -74,7 +74,7 @@
       onu_type: 'alpha'
       service_type: 'hsia'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1.35'
@@ -91,7 +91,7 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f0.65'
+      dp_iface_name: 'eth1.65'
       container_type: LXC
       container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
@@ -102,10 +102,10 @@
       onu_type: ''
       service_type: 'voip'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f1.65'
+      dp_iface_name: 'eth1.65'
       container_type: LXC
       container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
@@ -119,7 +119,7 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f0.55'
+      dp_iface_name: 'eth1.55'
       container_type: LXC
       container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
@@ -130,10 +130,10 @@
       onu_type: ''
       service_type: 'vod'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f1.55'
+      dp_iface_name: 'eth1.55'
       container_type: LXC
       container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
@@ -147,7 +147,7 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f0.55'
+      dp_iface_name: 'eth1.55'
       container_type: LXC
       container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
@@ -224,7 +224,7 @@
       user: null
       pass: null
       dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.6.254'
+      dp_iface_ip_qinq: '10.11.5.254'
       dp_iface_ip: null
       dp_iface_gateway: null
       container_type: null
diff --git a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
index b0d44f7..27c2d09 100644
--- a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
@@ -38,7 +38,7 @@
     ip: '10.90.0.224'
     user: 'root'
     pass: 'onl'
-    bngPort: '3'
+    bngPort: '31'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -48,7 +48,7 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
-    aggPort: '10'
+    aggPort: '1'
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb
@@ -74,7 +74,7 @@
       onu_type: 'alpha'
       service_type: 'hsia'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1.35'
@@ -91,7 +91,7 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f0.65'
+      dp_iface_name: 'eth1.65'
       container_type: LXC
       container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
@@ -102,10 +102,10 @@
       onu_type: ''
       service_type: 'voip'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f1.65'
+      dp_iface_name: 'eth1.65'
       container_type: LXC
       container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
@@ -119,7 +119,7 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f0.55'
+      dp_iface_name: 'eth1.55'
       container_type: LXC
       container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
@@ -130,10 +130,10 @@
       onu_type: ''
       service_type: 'vod'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f1.55'
+      dp_iface_name: 'eth1.55'
       container_type: LXC
       container_name: ALPHe3d1ceb7
       onu: 'ALPHe3d1ceb7'
@@ -147,7 +147,7 @@
       ip: '10.90.0.221'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens2f0.55'
+      dp_iface_name: 'eth1.55'
       container_type: LXC
       container_name: ALPHe3d1cea3
       onu: 'ALPHe3d1cea3'
@@ -224,7 +224,7 @@
       user: null
       pass: null
       dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.6.254'
+      dp_iface_ip_qinq: '10.11.5.254'
       dp_iface_ip: null
       dp_iface_gateway: null
       container_type: null
diff --git a/deployment-configs/flex-ocp-cord-openonupy.yaml b/deployment-configs/flex-ocp-cord-openonupy.yaml
index 08d363c..b7d88b2 100644
--- a/deployment-configs/flex-ocp-cord-openonupy.yaml
+++ b/deployment-configs/flex-ocp-cord-openonupy.yaml
@@ -38,7 +38,7 @@
     ip: '10.90.0.224'
     user: 'root'
     pass: 'onl'
-    bngPort: '3'
+    bngPort: '31'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -48,7 +48,7 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
-    aggPort: '10'
+    aggPort: '1'
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb
@@ -73,7 +73,7 @@
       power_switch_port: 1
       onu_type: 'alpha'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 08d363c..b7d88b2 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -38,7 +38,7 @@
     ip: '10.90.0.224'
     user: 'root'
     pass: 'onl'
-    bngPort: '3'
+    bngPort: '31'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -48,7 +48,7 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
-    aggPort: '10'
+    aggPort: '1'
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb
@@ -73,7 +73,7 @@
       power_switch_port: 1
       onu_type: 'alpha'
     -
-      ip: '10.90.0.221'
+      ip: '10.90.0.222'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1'
diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
index 2bb1005..50d881c 100755
--- a/kubernetes-configs/onf-demo-pod.conf
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -3,7 +3,7 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.70:6443"
+    server: "https://10.128.100.71:6443"
     certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
       WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
       FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\