diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 2a948b1..12afcdd 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -86,8 +86,8 @@
               value: {{ tpl .Values.rw_core.kv_store_data_prefix . }}
           args:
             - "/app/rw_core"
-            - "--kv_store_type=etcd"
-            - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
+            - "--kv_store_type={{ tpl .Values.services.kvstore.type . }}"
+            - "--kv_store_address={{ tpl .Values.services.kvstore.address . }}"
             - "--grpc_nbi_address=0.0.0.0:50057"
             - "--grpc_sbi_address=0.0.0.0:50058"
             - "--banner"