diff --git a/xos-services/fabric-crossconnect/templates/_helpers.tpl b/xos-services/fabric-crossconnect/templates/_helpers.tpl
index 58c4829..53aae13 100644
--- a/xos-services/fabric-crossconnect/templates/_helpers.tpl
+++ b/xos-services/fabric-crossconnect/templates/_helpers.tpl
@@ -51,7 +51,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
@@ -68,7 +68,7 @@
     kafka:
       class: kafkaloghandler.KafkaLogHandler
       bootstrap_servers:
-        - "cord-kafka:9092"
+        - "{{ .Values.kafkaService }}:9092"
       topic: xos.log.fabric-crossconnect
   loggers:
     '':