diff --git a/voltha/templates/api-svc.yaml b/voltha/templates/api-svc.yaml
index 7edc0ea..add4aba 100644
--- a/voltha/templates/api-svc.yaml
+++ b/voltha/templates/api-svc.yaml
@@ -19,7 +19,7 @@
   namespace: "{{ .Release.Namespace }}"
 spec:
   ports:
-    - name: grpc
+    - name: nbi-grpc
       port: 55555
       targetPort: 50057
   selector:
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 84f13e4..fa5731b 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -88,24 +88,27 @@
             - "/app/rw_core"
             - "--kv_store_type=etcd"
             - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
-            - "--grpc_address=0.0.0.0:50057"
+            - "--grpc_nbi_address=0.0.0.0:50057"
+            - "--grpc_sbi_address=0.0.0.0:50058"
             - "--banner"
-            - "--kafka_adapter_address={{ tpl .Values.services.kafka.adapter.address . }}"
             - "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
-            - "--rw_core_topic={{ tpl .Values.rw_core.topics.core_topic . }}"
+            - "--rpc_timeout={{ tpl .Values.rw_core.rpc_timeout . }}"
+            - "--internal_timeout={{ tpl .Values.rw_core.internal_timeout . }}"
             - "--event_topic={{ .Values.rw_core.topics.event_topic }}"
-            - "--core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
-            - "--timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"
-            - "--timeout_request={{ tpl .Values.rw_core.timeout_request . }}"
             - "--log_level={{ $log_level }}"
             - "--probe_address=:8080"
             - "--trace_enabled={{ .Values.global.tracing.enabled }}"
             - "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
             - "--log_correlation_enabled={{ .Values.global.log_correlation.enabled }}"
             - "--stack_id={{ tpl .Values.rw_core.stack_id . }}"
+            - "--backoff_retry_initial_interval={{ .Values.rw_core.backoff_initial_interval }}"
+            - "--backoff_retry_max_interval={{ .Values.rw_core.backoff_max_interval }}"
+            - "--backoff_retry_max_elapsed_time={{ .Values.rw_core.backoff_max_elapsed_time }}"
           ports:
             - containerPort: 50057
-              name: grpc
+              name: nbi-grpc
+            - containerPort: 50058
+              name: core-grpc
           {{- if .Values.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
@@ -114,14 +117,14 @@
             httpGet:
               path: /healthz
               port: 8080
-            initialDelaySeconds: 3
-            periodSeconds: 3
+            initialDelaySeconds: {{ .Values.probe.liveness.initial_delay_seconds }}
+            periodSeconds: {{ .Values.probe.liveness.period_seconds }}
           readinessProbe:
             httpGet:
               path: /readz
               port: 8080
-            initialDelaySeconds: 3
-            periodSeconds: 3
+            initialDelaySeconds: {{ .Values.probe.readiness.initial_delay_seconds }}
+            periodSeconds: {{ .Values.probe.readiness.period_seconds }}
           resources:
             requests:
               {{- if .Values.resources.rw_core.requests.memory }}
diff --git a/voltha/templates/core-svc.yaml b/voltha/templates/core-svc.yaml
new file mode 100644
index 0000000..e5aa343
--- /dev/null
+++ b/voltha/templates/core-svc.yaml
@@ -0,0 +1,27 @@
+# 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.
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ template "fullname" . }}-core"
+  namespace: "{{ .Release.Namespace }}"
+spec:
+  ports:
+    - name: core-grpc
+      port: 55558
+      targetPort: 50058
+  selector:
+    app: rw-core
+    release: "{{ .Release.Name }}"