diff --git a/VERSION b/VERSION
index 944880f..8ee49b2 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.0
+3.2.1-dev
diff --git a/voltha-northbound-bbf-adapter/Chart.yaml b/voltha-northbound-bbf-adapter/Chart.yaml
index 1ba3c04..2e6b680 100644
--- a/voltha-northbound-bbf-adapter/Chart.yaml
+++ b/voltha-northbound-bbf-adapter/Chart.yaml
@@ -22,5 +22,5 @@
   - "voltha"
   - "bbf"
   - "adapter"
-version: 0.0.1-dev3
+version: 0.0.1-dev4
 appVersion: 0.0.1
diff --git a/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml b/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
index 8cee9ad..c422c74 100644
--- a/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
+++ b/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
@@ -40,4 +40,5 @@
         --onos_rest_endpoint={{ .Values.global.voltha_infra_name }}-onos-classic-hs.{{ .Values.global.voltha_infra_namespace }}.svc:{{ .Values.voltha_northbound_bbf_adapter.onos_rest_port }} \
         --onos_user={{ .Values.voltha_northbound_bbf_adapter.onos_user }} \
         --onos_pass={{ .Values.voltha_northbound_bbf_adapter.onos_pass }} \
-        --schema_mount_path={{ .Values.voltha_northbound_bbf_adapter.schema_mount_path }}
\ No newline at end of file
+        --schema_mount_path={{ .Values.voltha_northbound_bbf_adapter.schema_mount_path }} \
+        --kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}
\ No newline at end of file
diff --git a/voltha-northbound-bbf-adapter/values.yaml b/voltha-northbound-bbf-adapter/values.yaml
index e886002..13a7e51 100644
--- a/voltha-northbound-bbf-adapter/values.yaml
+++ b/voltha-northbound-bbf-adapter/values.yaml
@@ -53,9 +53,12 @@
 
 # Define connectivity to required services
 services:
+  kafka:
+      cluster:
+        address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
   # Define Tracing Agent connection details
   tracing_agent:
-    address: jaeger-agent:6831
+      address: "{{ .Values.global.voltha_infra_name }}-voltha-tracing-jaeger-agent.{{ .Values.global.voltha_infra_namespace }}.svc:6831"
 
 # Define the replica count for everything
 replicas: