diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index d4971c2..d2c75c0 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.13
+version: 2.1.14
 
 # appVersion is 2 because this chart contains multiple 2.x images that may have
 # different individual image versions.
diff --git a/voltha/templates/afrouter-config.yaml b/voltha/templates/afrouter-config.yaml
index 1b57d5d..669c711 100644
--- a/voltha/templates/afrouter-config.yaml
+++ b/voltha/templates/afrouter-config.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- if not .Values.therecanbeonlyone }}
 ---
 {{- $root := . }}
 apiVersion: v1
@@ -284,3 +285,4 @@
 metadata:
   name: afrouter-config
   serviceAccountName: {{ .Values.serviceaccount }}
+{{- end}}
diff --git a/voltha/templates/api-server.yaml b/voltha/templates/api-server.yaml
index 8a8f59f..a4d5d7a 100644
--- a/voltha/templates/api-server.yaml
+++ b/voltha/templates/api-server.yaml
@@ -11,7 +11,7 @@
 # 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.
-
+{{- if not .Values.therecanbeonlyone }}
 ---
 apiVersion: v1
 kind: Service
@@ -104,3 +104,4 @@
         - name: config-volume
           configMap:
             name: afrouter-config
+{{- end }}
diff --git a/voltha/templates/ro-core.yaml b/voltha/templates/ro-core.yaml
index 0879cc0..e463cc1 100644
--- a/voltha/templates/ro-core.yaml
+++ b/voltha/templates/ro-core.yaml
@@ -11,6 +11,7 @@
 # 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.
+{{- if not .Values.therecanbeonlyone }}
 {{- $set_log_level := tpl .Values.rw_core.log_level . | upper }}
 {{- $log_level := 3 }}
 {{- if eq $set_log_level "DEBUG" }}
@@ -139,3 +140,4 @@
               port: 8080
               initialDelaySeconds: 10
               periodSeconds: 5
+{{- end }}
diff --git a/voltha/templates/rw-core-only-one.yaml b/voltha/templates/rw-core-only-one.yaml
new file mode 100644
index 0000000..3dcb518
--- /dev/null
+++ b/voltha/templates/rw-core-only-one.yaml
@@ -0,0 +1,135 @@
+# Copyright 2019-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.
+{{- if .Values.therecanbeonlyone }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: voltha-api
+  serviceAccountName: {{ .Values.serviceaccount }}
+spec:
+  serviceAccountName: {{ .Values.serviceaccount }}
+  ports:
+    - name: grpc
+      port: 55555
+      targetPort: 50057
+  selector:
+    app: rw-core
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: voltha-rw-core
+  serviceAccountName: {{ .Values.serviceaccount }}
+spec:
+  serviceAccountName: {{ .Values.serviceaccount }}
+  clusterIP: None
+  ports:
+    - name: grpc
+      port: 50057
+      targetPort: 50057
+  selector:
+    app: rw-core
+---
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: voltha-rw-core
+  serviceAccountName: {{ .Values.serviceaccount }}
+  {{- if or (hasKey .Values "extra_deployment_labels") (hasKey .Values "rw_core_deployment_labels") }}
+  labels:
+    {{- if hasKey .Values "extra_deployment_labels" }}
+    {{- range $key, $val := .Values.extra_deployment_labels }}
+    {{ $key }}: {{ $val | quote }}
+    {{- end }}
+    {{- end }}
+    {{- if hasKey .Values "rw_core_deployment_labels" }}
+    {{- range $key, $val := .Values.rw_core_deployment_labels }}
+    {{ $key }}: {{ $val | quote }}
+    {{- end }}
+    {{- end }}
+  {{- end }}
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: rw-core
+        app.kubernetes.io/name: "read-write-core"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "core"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        {{- if hasKey .Values "extra_pod_labels" }}
+        {{- range $key, $val := .Values.extra_pod_labels }}
+        {{ $key }}: {{ $val | quote }}
+        {{- end }}
+        {{- end }}
+        {{- if hasKey .Values "rw_core_pod_labels" }}
+        {{- range $key, $val := .Values.rw_core_pod_labels }}
+        {{ $key }}: {{ $val | quote }}
+        {{- end }}
+        {{- end }}
+      annotations:
+        cni: "calico"
+    spec:
+      serviceAccountName: {{ .Values.serviceaccount }}
+      containers:
+        - name: voltha
+          image: '{{ tpl .Values.images.rw_core.registry . }}{{ tpl .Values.images.rw_core.repository . }}:{{ tpl .Values.images.rw_core.tag . }}'
+          imagePullPolicy: {{ tpl .Values.images.rw_core.pullPolicy . }}
+          env:
+            - name: NAMESPACE
+              value: voltha
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+          args:
+            - "/app/rw_core"
+            - "-kv_store_type=etcd"
+            - "-kv_store_host={{ .Values.services.etcd.service }}"
+            - "-kv_store_port={{ .Values.services.etcd.port }}"
+            - "-grpc_host=0.0.0.0"
+            - "-grpc_port=50057"
+            - "-banner=true"
+            - "-kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
+            - "-kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
+            - "-kafka_cluster_host={{ .Values.services.kafka.cluster.port }}"
+            - "-kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
+            - "-rw_core_topic=rwcore"
+            - "-core_pair_topic=core-pair-1"
+            - "-kv_store_data_prefix=service/voltha"
+            - "-in_competing_mode=false"
+            - "-core_timeout=9999"
+            - "-timeout_long_request=9999"
+            - "-timeout_request=9999"
+            - "-probe_port=8080"
+          ports:
+            - containerPort: 50057
+              name: grpc
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+            initialDelaySeconds: 3
+            periodSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: /readz
+              port: 8080
+            initialDelaySeconds: 3
+            periodSeconds: 3
+{{- end }}
diff --git a/voltha/templates/rw-core.yaml b/voltha/templates/rw-core.yaml
index 75333a6..01c7da2 100644
--- a/voltha/templates/rw-core.yaml
+++ b/voltha/templates/rw-core.yaml
@@ -11,7 +11,7 @@
 # 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.
-
+{{- if not .Values.therecanbeonlyone }}
 {{- $root := . -}}
 {{- $tag := tpl .Values.images.rw_core.tag . }}
 {{- $repository := tpl .Values.images.rw_core.repository . }}
@@ -180,5 +180,6 @@
               port: 8080
             initialDelaySeconds: 3
             periodSeconds: 3
-{{end}}
-{{end}}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index ba15bcd..e225727 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -16,6 +16,7 @@
 serviceaccount: voltha-serviceaccount
 private_etcd_cluster: true
 private_kafka_cluster: true
+therecanbeonlyone: false
 
 # Default Values
 # The following are the default values used for every container in the