diff --git a/xos-services/kubernetes/templates/_helpers.tpl b/xos-services/kubernetes/templates/_helpers.tpl
index a58f7f6..98ee611 100644
--- a/xos-services/kubernetes/templates/_helpers.tpl
+++ b/xos-services/kubernetes/templates/_helpers.tpl
@@ -47,7 +47,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
@@ -64,7 +64,7 @@
     kafka:
       class: kafkaloghandler.KafkaLogHandler
       bootstrap_servers:
-        - "cord-kafka:9092"
+        - "{{ .Values.kafkaService }}:9092"
       topic: xos.log.kubernetes
   loggers:
     '':
diff --git a/xos-services/kubernetes/values.yaml b/xos-services/kubernetes/values.yaml
index a1383be..eb39651 100644
--- a/xos-services/kubernetes/values.yaml
+++ b/xos-services/kubernetes/values.yaml
@@ -32,6 +32,7 @@
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
 
 kafkaService: "cord-kafka"