diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 0f8d01b..6477732 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -52,6 +52,7 @@
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 6
 
 onus:
   -
diff --git a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
index 4616a8b..bd900a3 100644
--- a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
@@ -52,6 +52,7 @@
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 6
 
 onus:
   -
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 566a09d..5b19c9c 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -52,6 +52,7 @@
     serial: 'EC1838000853'
     oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 6
 
 onus:
   -
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 56500fe..8441b3b 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -53,6 +53,7 @@
     serial: 'EC1721000216'
     oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 2
 
 onus:
   -
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 5c1d52c..04e48ea 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -52,6 +52,7 @@
       serial: EC1912001818
       oltDebVersion: openolt_asgvolt64-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
       board_technology: GPON
+      power_switch_port: 3
 
   hosts:
     src:
diff --git a/deployment-configs/onf-demo-pod-openonugo-DT.yaml b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
deleted file mode 100644
index 9b5b33e..0000000
--- a/deployment-configs/onf-demo-pod-openonugo-DT.yaml
+++ /dev/null
@@ -1,125 +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.
-
-# Automated deployment configuration for BBWF POD
-
----
-
-kube_config: '/var/k8.conf'
-
-nodes:
-  -
-    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: '10.128.100.80'
-    user: 'root'
-    pass: 'onl'
-    bngPort: '31'
-    device_id: 'of:0000000000000001'
-
-olts:
-  -
-    name: 'edgecore'
-    ip: '10.128.99.90'
-    sship: '10.128.99.90'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-    aggPort: '1'
-    serial: 'EC1721000216'
-    oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
-    board_technology: XGS-PON
-
-onus:
-  -
-    serial: 'ISKT71e80080'
-  -
-    serial: 'ALPHe3d1cf9d'
-
-hosts:
-  src:
-    -
-      ip: '10.128.100.72'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.11'
-      container_type: LXC
-      container_name: ISKT71e80080
-      onu: 'ISKT71e80080'
-      olt: 'EC1721000216'
-      c_tag: '11'
-      s_tag: '11'
-      power_switch_port: 6
-      onu_type: 'iskratel'
-    -
-      ip: '10.128.100.71'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.22'
-      container_type: LXC
-      container_name: ALPHe3d1cf9d
-      onu: 'ALPHe3d1cf9d'
-      olt: 'EC1721000216'
-      c_tag: '22'
-      s_tag: '22'
-      power_switch_port: 1
-      onu_type: 'alpha'
-  dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.11.254'
-      noroot_ip: 10.128.100.70
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      dp_iface_ip_qinq: '10.22.22.254'
-      noroot_ip: '10.128.100.70'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-
-web_power_switch:
-  ip: '10.128.100.75'
-  user: 'cord'
-  password: 'cord'
-  type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod-openonugo.yaml b/deployment-configs/onf-demo-pod-openonugo.yaml
deleted file mode 100644
index fb02be9..0000000
--- a/deployment-configs/onf-demo-pod-openonugo.yaml
+++ /dev/null
@@ -1,125 +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.
-
-# Automated deployment configuration for BBWF POD
-
----
-
-kube_config: '/var/k8.conf'
-
-nodes:
-  -
-    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: '10.128.100.80'
-    user: 'root'
-    pass: 'onl'
-    bngPort: '31'
-    device_id: 'of:0000000000000001'
-
-olts:
-  -
-    name: 'edgecore'
-    ip: '10.128.99.90'
-    sship: '10.128.99.90'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-    aggPort: '1'
-    serial: 'EC1721000216'
-    oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
-    board_technology: XGS-PON
-
-onus:
-  -
-    serial: 'ISKT71e80080'
-  -
-    serial: 'ALPHe3d1cf9d'
-
-hosts:
-  src:
-    -
-      ip: '10.128.100.72'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1'
-      container_type: LXC
-      container_name: ISKT71e80080
-      onu: 'ISKT71e80080'
-      olt: 'EC1721000216'
-      c_tag: '11'
-      s_tag: '99'
-      power_switch_port: 6
-      onu_type: 'iskratel'
-      uni_id: '1'
-    -
-      ip: '10.128.100.71'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1'
-      container_type: LXC
-      container_name: ALPHe3d1cf9d
-      onu: 'ALPHe3d1cf9d'
-      olt: 'EC1721000216'
-      c_tag: '22'
-      s_tag: '99'
-      power_switch_port: 1
-      onu_type: 'alpha'
-      uni_id: '1'
-  dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.128.100.70'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      dp_iface_ip_qinq: '10.99.11.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.128.100.70'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      dp_iface_ip_qinq: '10.99.22.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-
-web_power_switch:
-  ip: '10.128.100.75'
-  user: 'cord'
-  password: 'cord'
-  type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index fb02be9..d86ed6c 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -53,6 +53,7 @@
     serial: 'EC1721000216'
     oltDebVersion: openolt_asfvolt16-3.6.2-602bf0a2b75e27e241cb73d7daf1e2c883539102-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 2
 
 onus:
   -