diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index d85e85c..918fd31 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -99,8 +99,8 @@
         - "--controller={{ tpl .address $ }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
-        - "--kv_store_type=etcd"
+        - "--kv_store_type={{ tpl .Values.services.kvstore.type . }}"
+        - "--kv_store_address={{ tpl .Values.services.kvstore.address . }}"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
         - "--device-refresh-interval={{ .Values.ofagent.device_refresh_interval }}"