diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 41ba36f..99007b0 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -89,11 +89,11 @@
               value: {{ .Values.defaults.kv_store_data_prefix }}
           args:
             - "/app/openolt"
-            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}"
-            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}"
+            - "--kafka_adapter_address={{ .Values.services.kafka.adapter.address }}"
+            - "--kafka_cluster_address={{ .Values.services.kafka.cluster.address }}"
             - "--core_topic={{ .Values.defaults.topics.core_topic }}"
             - "--adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
-            - "--kv_store_address={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
+            - "--kv_store_address={{ .Values.services.etcd.address }}"
             - "--log_level={{ $log_level }}"
             - "--current_replica={{ .Values.replicas.current_replica }}"
             - "--total_replica={{ .Values.replicas.total_replica }}"