diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 786c4cf..0f65439 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -78,7 +78,7 @@
         - "--controller={{ .service }}:{{ .port }}"
         {{- end }}
         - "--voltha={{ template "fullname" . }}-api.{{ .Release.Namespace }}.svc:55555"
-        - "--kv_store_address=etcd.{{ .Release.Namespace }}.svc:{{ .Values.services.etcd.port }}"
+        - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
         - "--kv_store_type=etcd"
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"