diff --git a/deployment-configs/abc.yaml b/deployment-configs/abc.yaml
deleted file mode 100644
index 6428b87..0000000
--- a/deployment-configs/abc.yaml
+++ /dev/null
@@ -1,80 +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 ONF/ABC physical POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'abc.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.255.21.1'
-  api_key: '3LKARGmAUQ8Rp7jJBU:5V7gkLUDvEEktBZnYh:TxLSprnNcgLmQAZQLm63Mv5Va7vhvSFT'
-  head_system_id: '4fe84k'
-
-dev_node:
-  name: 'ONF - ABC'
-  user: 'cord'
-
-head:
-  ip: '10.255.21.2'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.255.21.203'
-      user: 'root'
-      pass: 'Google321'
-  -
-    ipmi:
-      ip: '10.255.21.204'
-      user: 'root'
-      pass: 'Google321'
-  -
-    ipmi:
-      ip: '10.255.21.205'
-      user: 'root'
-      pass: 'Google321'
-
-fabric_switches:
-  -
-    mac: 'a8:2b:b5:d2:a6:78'
-    ip: '10.255.20.201'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: 'a8:2b:b5:bd:13:a7'
-    ip: '10.255.20.202'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: 'a8:2b:b5:9d:cd:73'
-    ip: '10.255.20.203'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
-  -
-    mac: 'a8:2b:b5:bd:15:ad'
-    ip: '10.255.20.204'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
diff --git a/deployment-configs/bbwf-links.json b/deployment-configs/bbwf-links.json
deleted file mode 100644
index dc2c642..0000000
--- a/deployment-configs/bbwf-links.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "of:0000000000000001/50-of:00000024454a6be4/1": {
-    "basic": {}
-  },
-  "of:00000024454a6be4/1-of:0000000000000001/50": {
-    "basic": {}
-  }
-}
diff --git a/deployment-configs/bbwf.yaml b/deployment-configs/bbwf.yaml
deleted file mode 100644
index 573acdc..0000000
--- a/deployment-configs/bbwf.yaml
+++ /dev/null
@@ -1,67 +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/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'
-  - name: 'adtran'
-    ip: '192.168.100.112'
-    user: 'hsvroot'
-    pass: 'BOSCO'
-  -
-    name: 'cig'
-    ip: '192.168.100.113'
-    user: 'root'
-    pass: 'onl'
-  -
-    name: 'cig'
-    ip: '192.168.100.114'
-    user: 'root'
-    pass: 'iskratel'
-  -
-    name: 'cig'
-    ip: '192.168.100.115'
-    user: 'root'
-    pass: 'iskratel'
\ No newline at end of file
diff --git a/deployment-configs/calix-pod1.yaml b/deployment-configs/calix-pod1.yaml
deleted file mode 100644
index 5e011d8..0000000
--- a/deployment-configs/calix-pod1.yaml
+++ /dev/null
@@ -1,75 +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 Calix POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'calix-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.66.12.5'
-  api_key: 'gSwcMgspjagTH5uyYQ:wPBBz3MRqAcDpXd2aL:C8aTg7pLmTpaF9bXZvN2bLDzzMCJVhTF'
-  head_system_id: 'wxcpkg'
-
-dev_node:
-  name: 'calix-cord-pod1'
-  user: 'sdn'
-
-head:
-  ip: '10.66.12.7'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.66.12.3'
-      user: 'admin'
-      pass: 'admin'
-  -
-    ipmi:
-      ip: '10.66.12.4'
-      user: 'admin'
-      pass: 'admin'
-
-fabric_switches:
-  -
-    mac: '48:0f:cf:ae:8e:12'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: '48:0f:cf:ae:6e:0a'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
-  -
-    mac: '48:0f:cf:ae:ee:ac'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: '48:0f:cf:ae:de:a8'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index 5f6d7f3..20c12ec 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -58,6 +58,7 @@
       serial: EC1912001814
       oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
       oltDebVersion23: openolt_asgvolt64-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-100G-NNI.deb
+      board_technology: GPON
  
   hosts:
     src:
diff --git a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
index 8776521..f57b83b 100644
--- a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
@@ -56,6 +56,7 @@
       serial: LBADTN2038AD991
       type: adtranolt
       user: hsvroot
+      board_technology: GPON
  
   hosts:
     src:
diff --git a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
index b71a9b4..b20b988 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
@@ -58,6 +58,7 @@
       serial: EC1912001814
       oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
       oltDebVersion23: openolt_asgvolt64-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-100G-NNI.deb
+      board_technology: GPON
 
   # XGS-PON OLT
     -
@@ -70,6 +71,7 @@
       serial: EC1729003539
       oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
       oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-100G-NNI.deb
+      board_technology: XGS-PON
 
   hosts:
     src:
diff --git a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
index 5f6d7f3..20c12ec 100644
--- a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
@@ -58,6 +58,7 @@
       serial: EC1912001814
       oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
       oltDebVersion23: openolt_asgvolt64-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-100G-NNI.deb
+      board_technology: GPON
  
   hosts:
     src:
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index 8525582..393a71e 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -58,6 +58,7 @@
     serial: 'EC1729003539'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-100G-NNI.deb
+    board_technology: XGS-PON
 
 
 hosts:
diff --git a/deployment-configs/edgecore-pod1.yaml b/deployment-configs/edgecore-pod1.yaml
deleted file mode 100644
index 96d9489..0000000
--- a/deployment-configs/edgecore-pod1.yaml
+++ /dev/null
@@ -1,42 +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 ONF/ON.Lab physical POD 1
-
----
-
-nodes:
-  -
-    ip: '192.168.99.181'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: '3c:2c:99:ea:89:f5'
-    ip: '192.168.99.183'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    ip: '192.168.99.182'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-
-srcHost:
-  ip: '10.0.3.56'
-  user: 'root'
-  pass: 'root'
diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 40aa307..223fcd8 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.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
index bac4c93..46b0bea 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.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml b/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
deleted file mode 100644
index 40aa307..0000000
--- a/deployment-configs/flex-ocp-cord-openonupy-TT.yaml
+++ /dev/null
@@ -1,256 +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 Flex POD 1 , olt/onu are connected to this
-
----
-
-kube_config: 'flex-ocp-cord-voltha-master.conf'
-
-nodes:
-  -
-    ip: '10.90.0.221'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.222'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.223'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.90.0.224'
-    user: 'root'
-    pass: 'onl'
-    bngPort: '31'
-    device_id: 'of:0000000000000001'
-
-olts:
-  -
-    ip: '10.90.0.225'
-    sship: '10.90.0.225'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-    aggPort: '1'
-    serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
-    oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
-
-onus:
-  -
-    serial: 'ALPHe3d1cfa7'
-
-hosts:
-  src:
-    -
-      ip: '10.90.0.221'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.35'
-      container_type: LXC
-      container_name: ALPHe3d1cea3
-      onu: 'ALPHe3d1cea3'
-      olt: 'EC1838000853'
-      c_tag: '801'
-      s_tag: '111'
-      power_switch_port: 1
-      onu_type: 'alpha'
-      service_type: 'hsia'
-      uni_id: '1'
-    -
-      ip: '10.90.0.222'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.35'
-      container_type: LXC
-      container_name: ALPHe3d1ceb7
-      onu: 'ALPHe3d1ceb7'
-      olt: 'EC1838000853'
-      c_tag: '101'
-      s_tag: '222'
-      power_switch_port: 2
-      onu_type: 'alpha'
-      service_type: 'hsia'
-      uni_id: '1'
-    -
-      ip: '10.90.0.221'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.65'
-      container_type: LXC
-      container_name: ALPHe3d1cea3
-      onu: 'ALPHe3d1cea3'
-      olt: 'EC1838000853'
-      c_tag: '444'
-      s_tag: '333'
-      power_switch_port: 1
-      onu_type: ''
-      service_type: 'voip'
-      uni_id: '1'
-    -
-      ip: '10.90.0.222'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.65'
-      container_type: LXC
-      container_name: ALPHe3d1ceb7
-      onu: 'ALPHe3d1ceb7'
-      olt: 'EC1838000853'
-      c_tag: '444'
-      s_tag: '333'
-      power_switch_port: 2
-      onu_type: ''
-      service_type: 'voip'
-      uni_id: '1'
-    -
-      ip: '10.90.0.221'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.55'
-      container_type: LXC
-      container_name: ALPHe3d1cea3
-      onu: 'ALPHe3d1cea3'
-      olt: 'EC1838000853'
-      c_tag: '55'
-      s_tag: '555'
-      power_switch_port: 1
-      onu_type: ''
-      service_type: 'vod'
-      uni_id: '1'
-    -
-      ip: '10.90.0.222'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.55'
-      container_type: LXC
-      container_name: ALPHe3d1ceb7
-      onu: 'ALPHe3d1ceb7'
-      olt: 'EC1838000853'
-      c_tag: '55'
-      s_tag: '555'
-      power_switch_port: 2
-      onu_type: ''
-      service_type: 'vod'
-      uni_id: '1'
-    -
-      ip: '10.90.0.221'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.55'
-      container_type: LXC
-      container_name: ALPHe3d1cea3
-      onu: 'ALPHe3d1cea3'
-      olt: 'EC1838000853'
-      c_tag: '55'
-      s_tag: '550'
-      power_switch_port: 1
-      onu_type: ''
-      mcast_rg: '10.11.6.3/24'
-      mcast_grp_subnet_mask: '224.0.0.0/4'
-      service_type: 'mcast'
-      uni_id: '1'
-  dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.1.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.90.0.223'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f1
-      dp_iface_ip_qinq: '10.11.2.254'
-      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.11.4.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.90.0.223'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f1
-      dp_iface_ip_qinq: '10.11.4.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.90.0.223'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f1
-      dp_iface_ip_qinq: '10.11.5.254'
-      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.11.5.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      bng_ip: '10.90.0.223'
-      bng_user: cord
-      bng_pass: cord
-      dp_iface_name: null
-      dp_iface_ip_qinq: '225.22.0.2'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-web_power_switch:
-  ip: '10.90.0.229'
-  user: 'cord'
-  password: 'cord'
-  type: 'DLI'
diff --git a/deployment-configs/flex-ocp-cord-openonupy.yaml b/deployment-configs/flex-ocp-cord-openonupy.yaml
deleted file mode 100644
index d8fcaeb..0000000
--- a/deployment-configs/flex-ocp-cord-openonupy.yaml
+++ /dev/null
@@ -1,123 +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 Flex POD 1 , olt/onu are connected to this
-
----
-
-kube_config: 'flex-ocp-cord-voltha-master.conf'
-
-nodes:
-  -
-    ip: '10.90.0.221'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.222'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.223'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.90.0.224'
-    user: 'root'
-    pass: 'onl'
-    bngPort: '31'
-    device_id: 'of:0000000000000001'
-
-olts:
-  -
-    ip: '10.90.0.225'
-    sship: '10.90.0.225'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-    aggPort: '1'
-    serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
-    oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
-
-onus:
-  -
-    serial: 'ALPHe3d1cfa7'
-
-hosts:
-  src:
-    -
-      ip: '10.90.0.221'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1'
-      container_type: LXC
-      container_name: ALPHe3d1cea3
-      onu: 'ALPHe3d1cea3'
-      olt: 'EC1838000853'
-      c_tag: '801'
-      s_tag: '111'
-      power_switch_port: 1
-      onu_type: 'alpha'
-      uni_id: '1'
-    -
-      ip: '10.90.0.222'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1'
-      container_type: LXC
-      container_name: ALPHe3d1ceb7
-      onu: 'ALPHe3d1ceb7'
-      olt: 'EC1838000853'
-      c_tag: '101'
-      s_tag: '222'
-      power_switch_port: 2
-      onu_type: 'alpha'
-      uni_id: '1'
-
-  dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.90.0.223'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f1
-      dp_iface_ip_qinq: '10.11.1.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.90.0.223'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f1
-      dp_iface_ip_qinq: '10.11.2.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-
-web_power_switch:
-  ip: '10.90.0.229'
-  user: 'cord'
-  password: 'cord'
-  type: 'DLI'
diff --git a/deployment-configs/flex-ocp-cord-voltha-master.yaml b/deployment-configs/flex-ocp-cord-voltha-master.yaml
deleted file mode 100644
index 853e2cc..0000000
--- a/deployment-configs/flex-ocp-cord-voltha-master.yaml
+++ /dev/null
@@ -1,78 +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 Flex POD 1 , olt/onu are connected to this
-
----
-
-kube_config: 'flex-ocp-cord-voltha-master.conf'
-
-nodes:
-  -
-    ip: '10.192.20.45'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.20.46'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.20.47'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.192.20.217'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    ip: '10.192.20.206'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-
-onus:
-  -
-    serial: 'ALPHe3d1cfa7'
-
-hosts:
-  src:
-    -
-      ip: '10.192.20.61'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'ens2f1'
-      container_type: null
-      container_name: null
-      onu: 'ALPHe3d1cfa7'
-      c_tag: '999'
-      s_tag: '111'
-      onu_type: 'alpha'
-      uni_id: '1'
-
-  dst:
-    -
-      ip: '10.192.20.47'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'ens3d1'
-      dp_iface_ip_qinq: '10.8.2.100'
-      dp_iface_ip: '10.8.3.1'
-      dp_iface_gateway: '10.8.3.254'
-      container_type: null
-      container_name: null
diff --git a/deployment-configs/flex-ocp-cord-voltha16.yaml b/deployment-configs/flex-ocp-cord-voltha16.yaml
deleted file mode 100644
index d1d98d4..0000000
--- a/deployment-configs/flex-ocp-cord-voltha16.yaml
+++ /dev/null
@@ -1,65 +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 Flex POD 1 , olt/onu are connected to this
-
----
-
-kube_config: 'flex-ocp-cord-voltha16.conf'
-
-nodes:
-  -
-    ip: '10.192.20.45'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.20.46'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.20.47'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.192.20.217'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    ip: '10.192.20.206'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-
-hosts:
-  src:
-    ip: '10.192.20.61'
-    user: 'cord'
-    pass: 'cord'
-    dp_iface_name: 'ens2f1'
-    dp_iface_ip: '10.8.2.1'
-    dp_iface_gateway: '10.8.2.254'
-    uni_id: '1'
-  dst:
-    ip: '10.192.20.198'
-    user: 'cord'
-    pass: 'cord'
-    dp_iface_name: 'ens3d1'
-    dp_iface_ip_qinq: '10.8.2.100'
-    dp_iface_ip: '10.8.3.1'
-    dp_iface_gateway: '10.8.3.254'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index f34e5df..970f045 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.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/flex-ocp-mcord.yaml b/deployment-configs/flex-ocp-mcord.yaml
deleted file mode 100644
index 7a70a10..0000000
--- a/deployment-configs/flex-ocp-mcord.yaml
+++ /dev/null
@@ -1,23 +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.
-
-# MAAS System information for Flex OCP MCORD Server
-
----
-
-maas:
-  ip: '10.192.18.200'
-  api_key: 'MjANS9eByptLAWXVNU:pwuet4hrWkznmYmueF:hDgm7vnvLbfFCkNcAsS6j7Ezkwu9B5Ts'
-  head_system_id: 'rrwkmn'
-
diff --git a/deployment-configs/flex-onf-pod4.yaml b/deployment-configs/flex-onf-pod4.yaml
deleted file mode 100644
index 0798814..0000000
--- a/deployment-configs/flex-onf-pod4.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Automated deployment configuration for Flex POD 4
-
----
-
-kube_config: 'flex-onf-pod4.conf'
-
-nodes:
-  -
-    ip: '10.192.16.35'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.16.36'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.16.37'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.192.16.38'
-    user: 'cord'
-    pass: 'cord'
\ No newline at end of file
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
deleted file mode 100644
index f4b426c..0000000
--- a/deployment-configs/infosys-pod.yaml
+++ /dev/null
@@ -1,82 +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 INFOSYS POD , olt/onu are connected to this
-
----
-
-kube_config: 'infosys-pod.conf'
-
-nodes:
-  -
-    ip: '192.168.10.21'
-    user: 'ubuntu'
-    pass: 'ubuntu'
-
-fabric_switches:
-  -
-    mac: 'b8:6a:97:8b:ef:3c'
-    ip: '192.168.10.30'
-    user: 'root'
-    pass: 'onl'
-    bngPort: '3'
-    device_id: 'of:0000000000000001'
-
-olts:
-  -
-    ip: '192.168.10.75'
-    sship: '192.168.10.75'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-    aggPort: '10'
-    serial: 'EC1917000123'
-    oltDebVersion: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb 
-    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb 
-
-onus:
-  -
-    serial: 'ISKT71e82118'
-
-hosts:
-  src:
-    -
-      ip: '192.168.10.25'
-      user: 'voltharg'
-      pass: 'voltharg'
-      dp_iface_name: 'ens10'
-      container_type: null
-      container_name: null
-      olt: 'EC1917000123'
-      onu: 'ISKT71e82118'
-      c_tag: '222'
-      s_tag: '111'
-      onu_type: 'iskratel'
-      uni_id: '1'
-
-  dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      noroot_ip: '192.168.10.24' 
-      noroot_user: volthadhcp
-      noroot_pass: volthadhcp 
-      dp_iface_name: ens10
-      dp_iface_ip_qinq: '192.168.20.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
diff --git a/deployment-configs/mcord-local-cluster.yaml b/deployment-configs/mcord-local-cluster.yaml
deleted file mode 100644
index 8bf4ea3..0000000
--- a/deployment-configs/mcord-local-cluster.yaml
+++ /dev/null
@@ -1,37 +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
-
----
-
-nodes:
-  -
-    ip: '10.90.0.151'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.152'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.153'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    ip: '10.90.0.154'
-    user: 'root'
-    pass: 'onl'
diff --git a/deployment-configs/mcord-release-cluster.yaml b/deployment-configs/mcord-release-cluster.yaml
deleted file mode 100644
index 92a1a22..0000000
--- a/deployment-configs/mcord-release-cluster.yaml
+++ /dev/null
@@ -1,33 +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
-
----
-
-nodes:
-  -
-    ip: '10.90.0.131'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.132'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    ip: '10.90.0.133'
-    user: 'root'
-    pass: 'onl'
diff --git a/deployment-configs/mcord-remote-cluster.yaml b/deployment-configs/mcord-remote-cluster.yaml
deleted file mode 100644
index 7a73d7f..0000000
--- a/deployment-configs/mcord-remote-cluster.yaml
+++ /dev/null
@@ -1,23 +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
-
----
-
-nodes:
-  -
-    ip: '10.90.0.141'
-    user: 'cord'
-    pass: 'cord'
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
index fbf874e..051c5d0 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
@@ -54,6 +54,7 @@
       serial: 722033538840
       oltDebVersion: openolt_rlt-3200g-w-40g-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4.deb
       oltDebVersion23: openolt_rlt-3200g-w-40g-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4.deb
+      board_technology: GPON
 
   hosts:
     src:
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
index 440cf41..3cbe3aa 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
@@ -54,6 +54,7 @@
       serial: 722033538840
       oltDebVersion: openolt_rlt-3200g-w-40g-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4.deb
       oltDebVersion23: openolt_rlt-3200g-w-40g-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4.deb
+      board_technology: GPON
 
   hosts:
     src:
diff --git a/deployment-configs/nttcomm-pod1.yaml b/deployment-configs/nttcomm-pod1.yaml
deleted file mode 100644
index 5c078e3..0000000
--- a/deployment-configs/nttcomm-pod1.yaml
+++ /dev/null
@@ -1,76 +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 QCT POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'nttcomm-pod1.yml'
-
-make_release: 'true'
-
-maas:
-  ip: '192.168.18.60'
-  api_key: 'aCdu75LWyhMqMX9C6g:q6s39tsvRzLesSUXa5:VgrbVQx5FpQwk3PmJLED82RVSn2AqpPS'
-  head_system_id: 'h4ecwg'
-
-dev_node:
-  name: 'nttcomm-cord-pod1'
-  user: 'cord'
-
-head:
-  ip: '192.168.18.61'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '192.168.18.52'
-      user: 'Administrator'
-      pass: 'Administrator'
-  -
-    ipmi:
-      ip: '192.168.18.53'
-      user: 'Administrator'
-      pass: 'Administrator'
-  -
-    ipmi:
-      ip: '192.168.18.54'
-      user: 'Administrator'
-      pass: 'Administrator'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:a0:e5:bd'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-  -
-    mac: 'cc:37:ab:a0:e4:37'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-  -
-    mac: 'cc:37:ab:a0:e3:b5'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-  -
-    mac: 'cc:37:ab:a0:dd:9d'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
diff --git a/deployment-configs/ntteast-pod1.yaml b/deployment-configs/ntteast-pod1.yaml
deleted file mode 100644
index 9bf77b3..0000000
--- a/deployment-configs/ntteast-pod1.yaml
+++ /dev/null
@@ -1,56 +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 QCT POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'ntteast-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '192.168.99.60'
-  api_key: 'PsfrZpCyXZhwRQ8Wbb:DcNjKqVchaTQjJ3BvJ:GjFsRmbxgB8p5JuZu9MQGVPxsrkwrG8a'
-  head_system_id: '8bswf6'
-
-dev_node:
-  name: 'ntteast-cord-pod1'
-  user: 'cord'
-
-head:
-  ip: '192.168.99.61'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '192.168.99.52'
-      user: 'Administrator'
-      pass: 'Administrator'
-  -
-    ipmi:
-      ip: '192.168.99.53'
-      user: 'Administrator'
-      pass: 'Administrator'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:c1:26:a0'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index f5bcf3f..e88aaab 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -53,6 +53,7 @@
     serial: 'EC1904000654'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 467fb62..1ca7ab5 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.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
       oltDebVersion23: openolt_asgvolt64-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+      board_technology: GPON
 
   hosts:
     src:
diff --git a/deployment-configs/onf-demo-pod-openonugo-DT.yaml b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
index 94dc696..bc8d676 100644
--- a/deployment-configs/onf-demo-pod-openonugo-DT.yaml
+++ b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
@@ -53,6 +53,7 @@
     serial: 'EC1904000654'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onf-demo-pod-openonugo.yaml b/deployment-configs/onf-demo-pod-openonugo.yaml
index 5153b95..ca269e1 100644
--- a/deployment-configs/onf-demo-pod-openonugo.yaml
+++ b/deployment-configs/onf-demo-pod-openonugo.yaml
@@ -53,6 +53,7 @@
     serial: 'EC1904000654'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 5153b95..ca269e1 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -53,6 +53,7 @@
     serial: 'EC1904000654'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index f010c29..986a539 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -50,6 +50,7 @@
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
     oltPort: '9191'
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index 0cca982..6e50886 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -44,6 +44,7 @@
     serial: 'EC1721000208'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index 0cca982..6e50886 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -44,6 +44,7 @@
     serial: 'EC1721000208'
     oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
     oltDebVersion23: openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb
+    board_technology: XGS-PON
 
 onus:
   -
diff --git a/deployment-configs/onlab-pod1-qa.yaml b/deployment-configs/onlab-pod1-qa.yaml
deleted file mode 100644
index 1aa1075..0000000
--- a/deployment-configs/onlab-pod1-qa.yaml
+++ /dev/null
@@ -1,135 +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 ONF/ON.Lab physical POD 1
-
----
-
-kube_config: '/var/new_jenkins_home/workspace/admin.conf'
-
-nodes:
-  -
-    ip: '10.90.0.101'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.102'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.103'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:61:80:ca'
-    ip: '10.90.0.111'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    ip: '10.90.0.114'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-
-onus:
-  -
-    serial: 'BRCM22222222'
-  -
-    serial: 'ISKT71e801a0'
-  -
-    serial: 'ALPHe3d1cfde'
-
-srcHost:
-  ip: '10.0.3.56'
-  user: 'root'
-  pass: 'root'
-
-hosts:
-  src:
-    -
-      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'
-      onu_type: 'alpha'
-      uni_id: '1'
-
-    -
-      ip: '10.90.0.51'
-      user: 'ubuntu'
-      pass: null
-      dp_iface_name: 'eth1'
-      container_type: 'LXC'
-      container_name: 'ISKT71e80080'
-      onu: 'ISKT71e80080'
-      c_tag: '113'
-      s_tag: '111'
-      onu_type: 'iskratel'
-      uni_id: '1'
-    -
-      ip: '10.90.0.51'
-      user: 'ubuntu'
-      pass: null
-      dp_iface_name: 'eth1'
-      container_type: 'LXC'
-      container_name: 'BRCM22222222'
-      onu: 'BRCM22222222'
-      c_tag: '114'
-      s_tag: '110'
-      onu_type: 'brcm'
-      uni_id: '1'
-
-  dst:
-    -
-      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
-    -
-      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
-    -
-      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/deployment-configs/onlab-pod1-voltha16.yaml b/deployment-configs/onlab-pod1-voltha16.yaml
deleted file mode 100644
index b42d174..0000000
--- a/deployment-configs/onlab-pod1-voltha16.yaml
+++ /dev/null
@@ -1,71 +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 ONF/ON.Lab physical POD 1
-
----
-
-kube_config: '/var/new_jenkins_home/workspace/admin.conf'
-
-nodes:
-  -
-    ip: '10.90.0.101'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.102'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.103'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:61:80:ca'
-    ip: '10.90.0.111'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    ip: '10.90.0.114'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-
-onus:
-  -
-    serial: 'BRCM22222222'
-  -
-    serial: 'ISKT71e801a0'
-  -
-    serial: 'ALPHe3d1cfde'
-
-srcHost:
-  ip: '10.0.3.56'
-  user: 'root'
-  pass: 'root'
-
-hosts:
-  src:
-    ip: '10.90.0.51'
-    user: 'ubuntu'
-    dp_iface_name: 'eth1'
-    container_type: 'LXC'
-    container_name: 'ALPHe3d1cfde'
-    uni_id: '1'
-  dst:
-    dp_iface_ip_qinq: '8.8.8.8'
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
deleted file mode 100644
index 095424e..0000000
--- a/deployment-configs/onlab-pod1.yaml
+++ /dev/null
@@ -1,94 +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 ONF/ON.Lab physical POD 1
-
----
-
-kube_config: '/var/new_jenkins_home/workspace/admin.conf'
-
-nodes:
-  -
-    ip: '10.90.0.101'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.102'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.90.0.103'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:61:80:ca'
-    ip: '10.90.0.111'
-    user: 'root'
-    pass: 'onl'
-    bngPort: '31'
-    device_id: 'of:0000000000000001'
-
-olts:
-  -
-    ip: '10.90.0.114'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-    aggPort: '1'
-    serial: 'EC1721000216'
-    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
-
-onus:
-  -
-    serial: 'ALPHe3d1cfde'
-  -
-    serial: 'ISKT71e801a0'
-  -
-    serial: 'BRCM22222222'
-
-srcHost:
-  ip: '10.0.3.56'
-  user: 'root'
-  pass: 'root'
-
-hosts:
-  src:
-    -
-      ip: '10.90.0.51'
-      user: 'ubuntu'
-      pass: null
-      dp_iface_name: 'eth1'
-      container_type: 'LXC'
-      container_name: 'ALPHe3d1cfde'
-      onu: 'ALPHe3d1cfde'
-      olt: 'EC1721000216'
-      c_tag: '112'
-      s_tag: '111'
-      onu_type: 'alpha'
-      uni_id: '1'
-
-  dst:
-    -
-      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/deployment-configs/onlab-pod2.yaml b/deployment-configs/onlab-pod2.yaml
deleted file mode 100644
index 960950a..0000000
--- a/deployment-configs/onlab-pod2.yaml
+++ /dev/null
@@ -1,61 +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 ONF/ON.Lab physical POD 1
-
----
-
-kube_config: '/var/new_jenkins_home/workspace/admin.conf'
-
-nodes:
-  -
-    ip: '10.90.0.120'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:61:80:ca'
-    ip: '10.90.0.121'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    ip: '10.90.0.122'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
-
-onus:
-  -
-    serial: 'ISKT71e80080'
-  -
-    serial: 'ALPHe3d1cfe3'
-
-srcHost:
-  ip: '10.0.3.56'
-  user: 'root'
-  pass: 'root'
-
-hosts:
-  src:
-    ip: '10.90.0.51'
-    user: 'ubuntu'
-    dp_iface_name: 'eth1'
-    container_type: 'LXC'
-    container_name: 'ALPHe3d1cfe3'
-    uni_id: '1'
-  dst:
-    dp_iface_ip_qinq: '8.8.8.8'
diff --git a/deployment-configs/qct-pod1.yaml b/deployment-configs/qct-pod1.yaml
deleted file mode 100644
index b657b73..0000000
--- a/deployment-configs/qct-pod1.yaml
+++ /dev/null
@@ -1,35 +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 QCT POD 1
-
----
-
-kube_config: 'qct-pod1.conf'
-
-nodes:
-  -
-    ip: '10.201.101.11'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.201.101.12'
-    user: 'cord'
-    pass: 'cord'
-  -
-    ip: '10.201.101.13'
-    user: 'cord'
-    pass: 'cord'
-
-olts: []
\ No newline at end of file