diff --git a/assessment-api/assessment-service/conf/application.conf b/assessment-api/assessment-service/conf/application.conf
index 3c9b24dd73f146bf524aa8e3a87f9ac96bf1c511..812b0989c080a18f559b1c365d52a8c479e6f33f 100644
--- a/assessment-api/assessment-service/conf/application.conf
+++ b/assessment-api/assessment-service/conf/application.conf
@@ -346,7 +346,7 @@ schema.base_path="../../schemas/"
 
 # Cassandra Configuration
 cassandra.lp.connection="127.0.0.1:9042"
-content.keyspace = "dev_content_store"
+content.keyspace = "content_store"
 
 # Redis Configuration
 redis.host="localhost"
@@ -396,16 +396,16 @@ kafka {
   topic.send.enable : true
   topics.instruction : "sunbirddev.assessment.publish.request"
 }
-objectcategorydefinition.keyspace="dev_category_store"
+objectcategorydefinition.keyspace="category_store"
 question {
-  keyspace = "dev_question_store"
+  keyspace = "question_store"
   list.limit=20
 }
 competency {
   keyspace = "taxonomy"
   list.limit=20
 }
-questionset.keyspace="dev_hierarchy_store"
+questionset.keyspace="hierarchy_store"
 
 cassandra {
   lp {
diff --git a/content-api/content-service/conf/application.conf b/content-api/content-service/conf/application.conf
index ed2649cbc94ff1b1c9abbd10f363a973e6cbce93..5a77be1c5df483e209fa511755fff0262200a9b3 100644
--- a/content-api/content-service/conf/application.conf
+++ b/content-api/content-service/conf/application.conf
@@ -373,17 +373,17 @@ languageCode {
 
 platform.language.codes=["as","bn","en","gu","hi","hoc","jun","ka","mai","mr","unx","or","san","sat","ta","te","urd"]
 
-collection.keyspace = "dev_hierarchy_store"
-content.keyspace = "dev_content_store"
+collection.keyspace = "hierarchy_store"
+content.keyspace = "content_store"
 
 # Learning-Service Configuration
 content.metadata.visibility.parent=["textbookunit", "courseunit", "lessonplanunit", "event"]
 
 # Cassandra Configuration
-content.keyspace.name=dev_content_store
-content.keyspace.table=content_data
+//content.keyspace.name=content_store
+//content.keyspace.table=content_data
 #TODO: Add Configuration for assessment. e.g: question_data
-orchestrator.keyspace.name=dev_question_store
+orchestrator.keyspace.name=question_store
 orchestrator.keyspace.table=question_data
 cassandra.lp.connection="127.0.0.1:9042"
 cassandra.lpa.connection="127.0.0.1:9042"
@@ -545,10 +545,10 @@ learning.service_provider=["youtube"]
 stream.mime.type=video/mp4
 compositesearch.index.name="compositesearch"
 
-hierarchy.keyspace.name=dev_hierarchy_store
+hierarchy.keyspace.name=hierarchy_store
 content.hierarchy.table=content_hierarchy
 framework.hierarchy.table=framework_hierarchy
-objectcategorydefinition.keyspace=dev_category_store
+objectcategorydefinition.keyspace=category_store
 
 # Kafka topic for definition update event.
 kafka.topic.system.command="dev.system.command"