diff --git a/xos-services/hippie-oss/templates/_helpers.tpl b/xos-services/hippie-oss/templates/_helpers.tpl
index f395a0c..47695c7 100644
--- a/xos-services/hippie-oss/templates/_helpers.tpl
+++ b/xos-services/hippie-oss/templates/_helpers.tpl
@@ -52,9 +52,6 @@
   username: {{ .Values.xosAdminUser | quote }}
   password: {{ .Values.xosAdminPassword | quote }}
   endpoint: xos-core:50051
-event_bus:
-  endpoint: cord-kafka-kafka
-  kind: kafka
 required_models:
   - HippieOSSService
   - HippieOSSServiceInstance
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index fc02c63..ddffea6 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -186,7 +186,7 @@
         value: >
           {
             "kafka" : {
-              "bootstrapServers" : "cord-kafka-kafka.default.svc.cluster.local:9092"
+              "bootstrapServers" : "cord-kafka.default.svc.cluster.local:9092"
             }
           }
       requirements:
diff --git a/xos-services/simpleexampleservice/templates/_helpers.tpl b/xos-services/simpleexampleservice/templates/_helpers.tpl
index f5f7a4f..d1fb889 100644
--- a/xos-services/simpleexampleservice/templates/_helpers.tpl
+++ b/xos-services/simpleexampleservice/templates/_helpers.tpl
@@ -53,7 +53,7 @@
   password: {{ .Values.xosAdminPassword | quote }}
   endpoint: xos-core:50051
 event_bus:
-  endpoint: cord-kafka-kafka
+  endpoint: cord-kafka
   kind: kafka
 required_models:
   - SimpleExampleService
diff --git a/xos-services/volt/templates/_helpers.tpl b/xos-services/volt/templates/_helpers.tpl
index 36706ed..a19e6f7 100644
--- a/xos-services/volt/templates/_helpers.tpl
+++ b/xos-services/volt/templates/_helpers.tpl
@@ -53,7 +53,7 @@
   password: {{ .Values.xosAdminPassword | quote }}
   endpoint: xos-core:50051
 event_bus:
-  endpoint: cord-kafka-kafka
+  endpoint: cord-kafka
   kind: kafka
 logging:
   version: 1