diff --git a/deployment-configs/onf-demo-pod-openonugo.yaml b/deployment-configs/onf-demo-pod-openonugo.yaml
new file mode 100644
index 0000000..906098a
--- /dev/null
+++ b/deployment-configs/onf-demo-pod-openonugo.yaml
@@ -0,0 +1,123 @@
+# 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.111.0.3'
+    sship: '10.128.99.90'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    aggPort: '1'
+    serial: 'EC1904000654'
+    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+
+onus:
+  -
+    serial: 'ISKT71e80080'
+  -
+    serial: 'ALPHe3d1cf9d'
+
+hosts:
+  src:
+    -
+      ip: '10.128.100.72'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens255f0'
+      container_type: null
+      container_name: null
+      onu: 'ISKT71e80080'
+      olt: 'EC1904000654'
+      c_tag: '11'
+      s_tag: '99'
+      power_switch_port: 6
+      onu_type: 'iskratel'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens255f0'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cf9d'
+      olt: 'EC1904000654'
+      c_tag: '22'
+      s_tag: '99'
+      power_switch_port: 1
+      onu_type: 'alpha'
+  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/kubernetes-configs/onf-demo-pod-onpenonugo.conf b/kubernetes-configs/onf-demo-pod-openonugo.conf
similarity index 100%
rename from kubernetes-configs/onf-demo-pod-onpenonugo.conf
rename to kubernetes-configs/onf-demo-pod-openonugo.conf
diff --git a/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch-inband.json b/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch-inband.json
new file mode 100644
index 0000000..66e893b
--- /dev/null
+++ b/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch-inband.json
@@ -0,0 +1,41 @@
+{
+  "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"
+      }
+    }
+  },
+  "ports" : {
+    "of:0000000000000001/16" : {
+      "interfaces" : [
+        { "name" : "voltha-intf", "vlan-untagged": 4093 }
+      ]
+    },
+    "of:0000000000000001/31" : {
+      "interfaces" : [
+        { "name" : "bng-intf", "vlan-tagged": [4093] }
+      ]
+    },
+    "of:0000000000000001/1" : {
+      "interfaces" : [
+        { "name" : "olt-intf", "vlan-tagged": [4093] }
+      ]
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}