diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 0f8f665..be4c336 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,18 +28,18 @@
 name: voltha-stack
 
 appVersion: "2.9-dev"
-version: 2.9.8
+version: 2.9.9
 
 dependencies:
   - name: voltha
     repository: file://../voltha
-    version: 2.10.4
+    version: 2.10.5
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
-    version: 2.9.6
+    version: 2.9.7
     condition: voltha-adapter-openonu.enabled
   - name: voltha-adapter-openolt
     repository: file://../voltha-adapter-openolt
-    version: 2.10.5
+    version: 2.10.6
     condition: voltha-adapter-openolt.enabled
diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index 0bd6b77..7f69868 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.yaml
@@ -18,6 +18,7 @@
   log_level: "WARN"
   voltha_infra_name: "voltha-infra"
   voltha_infra_namespace: "infra"
+  core_endpoint: "{{ .Release.Name }}-{{ .Values.global.stack_name }}-core.{{ .Release.Namespace }}.svc:55558"
   log_correlation:
     enabled: true
   tracing:
@@ -34,12 +35,8 @@
   rw_core:
     kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.stack_name }}'
     stack_id: "{{ .Values.global.stack_name }}"
-    topics:
-      core_topic: "{{ .Release.Name }}_{{ .Values.global.stack_name }}_rwcore"
   services:
     kafka:
-      adapter:
-        address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
       cluster:
         address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
     etcd:
@@ -51,13 +48,10 @@
   enabled: true
   adapter_open_onu:
     kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.stack_name }}'
-    topics:
-      core_topic: "{{ .Release.Name }}_{{ .Values.global.stack_name }}_rwcore"
-      adapter_open_onu_topic: "{{ .Release.Name }}_{{ .Values.global.stack_name }}_brcm_openomci_onu"
+    endpoints:
+      address: '{{ .Release.Name }}-voltha-adapter-openonu-api'
   services:
     kafka:
-      adapter:
-        address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
       cluster:
         address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
     etcd:
@@ -69,13 +63,10 @@
   enabled: true
   adapter_open_olt:
     kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.stack_name }}'
-    topics:
-      core_topic: "{{ .Release.Name }}_{{ .Values.global.stack_name }}_rwcore"
-      adapter_open_olt_topic: "{{ .Release.Name }}_{{ .Values.global.stack_name }}_openolt"
+    endpoints:
+      address: '{{ .Release.Name }}-voltha-adapter-openolt-api'
   services:
     kafka:
-      adapter:
-        address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
       cluster:
         address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
     etcd: