diff --git a/voltha-northbound-bbf-adapter/Chart.yaml b/voltha-northbound-bbf-adapter/Chart.yaml
index 2e6b680..e7f3cd0 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-dev4
+version: 0.0.1-dev5
 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 c422c74..85f2a03 100644
--- a/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
+++ b/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
@@ -41,4 +41,8 @@
         --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 }} \
-        --kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}
\ No newline at end of file
+        --kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }} \
+        --kv_store_type={{ tpl .Values.services.kv_store.type . }} \
+        --kv_store_address={{ tpl .Values.services.kv_store.address . }} \
+        --kv_store_request_timeout={{ tpl .Values.voltha_northbound_bbf_adapter.kv_store_timeout . }} \
+        --kv_store_prefix={{ tpl .Values.voltha_northbound_bbf_adapter.kv_store_data_prefix . }}
\ No newline at end of file
diff --git a/voltha-northbound-bbf-adapter/values.yaml b/voltha-northbound-bbf-adapter/values.yaml
index 13a7e51..39a142a 100644
--- a/voltha-northbound-bbf-adapter/values.yaml
+++ b/voltha-northbound-bbf-adapter/values.yaml
@@ -56,6 +56,9 @@
   kafka:
       cluster:
         address: "{{ .Values.global.voltha_infra_name }}-kafka.{{ .Values.global.voltha_infra_namespace }}.svc:9092"
+  kv_store:
+      type: "etcd"
+      address: "{{ .Values.global.voltha_infra_name }}-etcd.{{ .Values.global.voltha_infra_namespace }}.svc:2379"
   # Define Tracing Agent connection details
   tracing_agent:
       address: "{{ .Values.global.voltha_infra_name }}-voltha-tracing-jaeger-agent.{{ .Values.global.voltha_infra_namespace }}.svc:6831"
@@ -65,6 +68,8 @@
   bbf_adapter: 1
 
 voltha_northbound_bbf_adapter:
+  kv_store_timeout: "5s"
+  kv_store_data_prefix: 'service/voltha/{{ .Release.Name }}_{{ .Values.global.voltha_stack_name }}'
   log_netopeer2: false # If set to true netopeer2.log is created in the root of the container
   log_level: '{{ .Values.global.log_level }}'
   voltha_nbi_port: 55555