diff --git a/xos-services/onos-service/templates/_helpers.tpl b/xos-services/onos-service/templates/_helpers.tpl
index f408f3f..3d7d57c 100644
--- a/xos-services/onos-service/templates/_helpers.tpl
+++ b/xos-services/onos-service/templates/_helpers.tpl
@@ -52,7 +52,7 @@
 accessor:
   username: {{ .Values.xosAdminUser | quote }}
   password: {{ .Values.xosAdminPassword | quote }}
-  endpoint: xos-core:50051
+  endpoint: {{ .Values.xosCoreService | quote }}
 event_bus:
   endpoint: {{ .Values.kafkaService | quote }}
   kind: kafka
@@ -69,7 +69,7 @@
     kafka:
       class: kafkaloghandler.KafkaLogHandler
       bootstrap_servers:
-        - "cord-kafka:9092"
+        - "{{ .Values.kafkaService }}:9092"
       topic: xos.log.onos-service
   loggers:
     '':
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 21c4bbe..f39612d 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -32,6 +32,7 @@
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
 
 kafkaService: "cord-kafka"