diff --git a/kubernetes-configs/voltha/flex-ocp-cord-ofagent-go.yml b/kubernetes-configs/voltha/flex-ocp-cord-ofagent-go.yml
deleted file mode 100644
index 73154c7..0000000
--- a/kubernetes-configs/voltha/flex-ocp-cord-ofagent-go.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-use_ofagent_go: true
-
-images:
-#  onos:
-#    repository: voltha/voltha-onos
-#    tag: onos-2.2
-#  adapter_open_onu:
-#    repository: gcgirish/voltha-openonu-adapter
-#    tag: dhcp-issue
-  ofagent:
-    repository: voltha/ofagent-go
-    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"
-
-# Customization for BBSIM
-kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
-pon_ports: 1
-onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/onf-demo-pod-ofagent-go.yml b/kubernetes-configs/voltha/onf-demo-pod-ofagent-go.yml
deleted file mode 100644
index 73154c7..0000000
--- a/kubernetes-configs/voltha/onf-demo-pod-ofagent-go.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-use_ofagent_go: true
-
-images:
-#  onos:
-#    repository: voltha/voltha-onos
-#    tag: onos-2.2
-#  adapter_open_onu:
-#    repository: gcgirish/voltha-openonu-adapter
-#    tag: dhcp-issue
-  ofagent:
-    repository: voltha/ofagent-go
-    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"
-
-# Customization for BBSIM
-kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
-pon_ports: 1
-onus_per_pon_port: 1