diff --git a/deployment-configs/onf-demo-pod-DT-gpon.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
similarity index 100%
rename from deployment-configs/onf-demo-pod-DT-gpon.yaml
rename to deployment-configs/onf-demo-pod-gpon-DT.yaml
diff --git a/kubernetes-configs/onf-demo-pod-gpon.conf b/kubernetes-configs/onf-demo-pod-gpon.conf
new file mode 100755
index 0000000..188c654
--- /dev/null
+++ b/kubernetes-configs/onf-demo-pod-gpon.conf
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "onf-demo-pod-node1"
+  cluster:
+    server: "https://10.128.100.70:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURjeU5ESXlOVEF3T1ZvWERUTXdNRGN5TWpJeU5UQXdPVm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU1jSDZ5b0FOZjNOCndvS2ZDR0JKWTl2a3hKSEhHaDFleit3ZnJQQm8wb1BMWXBxRzZIK3RaW\
+      StXVkR0WHNrL3VzVzlieElqRmZCTHYKaHU5OFZQYTI5QjJIYko5WUVjb3ltZEd6ZUd5Ry9xenQxQ\
+      0U3ekZlZHVoajh4ZHRKMmxmaENJUXFWaytiV213aQpHYktZZmc5WVNpNHFZMG54emlkWHMvdU9vU\
+      kNPR1FJVk4wTjhpZlFaUEdyaVBCaEloQ2tob244dEhyUmRUNkFVCmxnWTllMVBqdHNQbjh6aWxxd\
+      VN4NGZod0ZCdGNoc0theWpseUM0eFJKU3ZpSnN2K0NSNXl6a3B6eGJOTm5MOTEKZitYQmVRSDMvT\
+      mZ6YkZ4enNUcEp5SGc3WnpMdkorMCtxNm9jWjVTdlB3cFdDNFNSNmtSWjFIRlpING9VZGZoeAp5M\
+      kF4dzNBYzZkVUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRkEyZnpWTmxhVHdrZGlQc2Jxc25VT\
+      TAvWitGMjdMWVB1RGsKaG5FQVlhMTVaVmhXOGthbkFUZ3UwRnAxZS84cXdwN2JlT1RHMUhSUGdBT\
+      mJCSFdPbjNRWllQRlZqVDhaRitpUgp6bWtYRVp6V1hBV1gzQkNCVlVBNm5SQWNpWW1wZUpiVEkvb\
+      UFONlpJTlRTRzc0anltd2sxYlBQRXlFOEZPZU1iCnQ1bWtaSjhIcFhubXVXMVltZmJvNGtnUUQ0e\
+      WU2UjlzbnJiTkhFZ0cwTmozd2FPNDlyY0FPOGVadnZqTGFrWUcKUFVMV1ZWaUFDYS9vaWYrdmprY\
+      WVoS0w3T3MzcTYrcnFERWdodmRoWTdxTWkwMFJYeTY5alJrSDNjQ0VqUlcxNwo1UWtJaTU4L04yY\
+      k5KcmduaUorWGljMUhid3dja0t5SitnZ1k1UDdQUVgwZmJONlhWNWc9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
+users:
+- name: "onf-demo-pod"
+  user:
+    token: "kubeconfig-user-cvpsj.c-77rjj:kwztnzdl5mxjcfdz58gxddscrlnqpmqfp2rnfcgzq6tzj8kt5lp754"
+
+contexts:
+- name: "onf-demo-pod-node1"
+  context:
+    user: "onf-demo-pod"
+    cluster: "onf-demo-pod-node1"
+
+current-context: "onf-demo-pod-node1"
diff --git a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
new file mode 100644
index 0000000..1c5cd66
--- /dev/null
+++ b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
@@ -0,0 +1,63 @@
+# Copyright 2019 Ciena Corporation
+#
+# 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.
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+#images:
+#  onos:
+#    repository: voltha/voltha-onos@sha256
+#    tag: 6f23767b85a6515bc465c4678c945d194551dd27abe2cf1b926a524b5e9eb3e6
+#  adapter_open_onu:
+#    repository: gcgirish/voltha-openonu-adapter
+#    tag: tpstate
+#  adapter_open_olt:
+#    repository: gcgirish/voltha-openolt-adapter
+#    tag: flow-sync
+#  rw_core:
+#    repository: khagerma/voltha-rw-core
+#    tag: update-port-fix
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+nodeAffinityConfig:
+  enabled: true
+  node_label_key: "in-band"
+  node_label_value: "yes"
+
+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"
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1