diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index f4cb7a1..84773ca 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -16,21 +16,13 @@
 
 ---
 
-kube_config: '/var/bbwf.conf'
+kube_config: '/var/k8.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:
   -
diff --git a/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
index 003f628..7a2168c 100644
--- a/kubernetes-configs/onf-demo-pod.yml
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -13,21 +13,7 @@
 # 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
-
-xos-gui:
-  xos_projectName: "SEBA"
-  xos_payoff: "Brought to you by the CORD Platform"
-  cord_version: 2.0.0-alpha
-  images:
-    xos_gui:
-      repository: '192.168.100.1:30500/xosproject/xos-gui'
-      tag: "candidate"
-
-rcord:
-  image:
-    repository: "192.168.100.1:30500/xosproject/rcord-synchronizer"
-    tag: 'candidate'
+# Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
 
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
new file mode 100644
index 0000000..1ae6459
--- /dev/null
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -0,0 +1,57 @@
+---
+# 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 DEMO POD, olt/onu are connected to this
+
+defaults:
+  image_tag: voltha-2.1
+  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
+  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"
diff --git a/tosca-configs/voltha/onf-demo-pod-onos-netcfg-switch.json b/tosca-configs/voltha/onf-demo-pod-onos-netcfg-switch.json
new file mode 100644
index 0000000..42a4c20
--- /dev/null
+++ b/tosca-configs/voltha/onf-demo-pod-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
+      }
+    }
+  }
+}