diff --git a/voltha b/voltha
index 7210b61..6301d92 100755
--- a/voltha
+++ b/voltha
@@ -2552,7 +2552,7 @@
   INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set defaults.topics.core_topic=$NAME-rwcore,defaults.kv_store_data_prefix=service/$NAME"
 fi
 if [[ $(semver_greater "$RESOLVED_VOLTHA_CHART_VERSION" "2.8.0") == "true" ]]; then
-  INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set rw_core.topics.core_topic=$NAME-rwcore,rw_core.kv_store_data_prefix=service/$NAME"
+  INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set rw_core.topics.core_topic=$NAME-rwcore"
 fi
 
 case $WITH_ETCD in
@@ -2650,7 +2650,6 @@
     if [[ $(semver_greater "$RESOLVED_VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION" "2.7.1") == "true" ]]; then
       INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set adapter_open_olt.topics.core_topic=$NAME-rwcore,adapter_open_onu.topics.core_topic=$NAME-rwcore "
       INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set adapter_open_olt.topics.adapter_open_olt_topic=$NAME-openolt,adapter_open_onu.topics.adapter_open_onu_topic=$NAME-brcm_openomci_onu "
-      INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" --set adapter_open_onu.kv_store_data_prefix=service/$NAME,adapter_open_olt.kv_store_data_prefix=service/$NAME "
     fi
 
     if is_in "$WITH_ETCD" "yes,external"; then