diff --git a/voltha-adapter-openolt/templates/adapters-openolt.yaml b/voltha-adapter-openolt/templates/adapters-openolt.yaml
index 6151c4b..aa3d6b8 100644
--- a/voltha-adapter-openolt/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openolt/templates/adapters-openolt.yaml
@@ -49,7 +49,6 @@
     {{- end }}
   {{- end }}
 spec:
-  replicas: {{ .Values.replicas.adapter_open_olt }}
   selector:
     matchLabels:
       app: adapter-open-olt
@@ -80,21 +79,26 @@
         - name: adapter-open-olt
           image: '{{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_olt.tag . ) . }}'
           imagePullPolicy: {{ tpl .Values.images.adapter_open_olt.pullPolicy . }}
-          env:
+          env: 
             - name: COMPONENT_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.labels['app.kubernetes.io/name']
+            - name: KV_STORE_DATAPATH_PREFIX
+              value: {{ .Values.defaults.kv_store_data_prefix }}
           args:
             - "/app/openolt"
             - "--kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
             - "--kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
             - "--kafka_cluster_host={{ .Values.services.kafka.cluster.service }}"
             - "--kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
-            - "--core_topic=rwcore"
+            - "--core_topic={{ .Values.defaults.topics.core_topic }}"
+            - "--adapter_topic={{ .Values.defaults.topics.adapter_open_olt_topic }}"
             - "--kv_store_host={{ .Values.services.etcd.service }}"
             - "--kv_store_port={{ .Values.services.etcd.port }}"
             - "--log_level={{ $log_level }}"
+            - "--current_replica={{ .Values.replicas.current_replica }}"
+            - "--total_replica={{ .Values.replicas.total_replica }}"
             - "--probe_port=8080"
           livenessProbe:
             httpGet: