diff --git a/src/main/environment/1097_ci.properties b/src/main/environment/1097_ci.properties
index d046eeec..f15983a4 100644
--- a/src/main/environment/1097_ci.properties
+++ b/src/main/environment/1097_ci.properties
@@ -23,3 +23,14 @@ fhir-url=@env.FHIR_API@
 spring.redis.host=@env.REDIS_HOST@
 
 cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
+
+# Elasticsearch Configuration
+elasticsearch.host=@env.ELASTICSEARCH_HOST@
+elasticsearch.port=@env.ELASTICSEARCH_PORT@
+elasticsearch.username=@env.ELASTICSEARCH_USERNAME@
+elasticsearch.password=@env.ELASTICSEARCH_PASSWORD@
+elasticsearch.index.beneficiary=@env.ELASTICSEARCH_INDEX_BENEFICIARY@
+
+# Enable/Disable ES (for gradual rollout)
+elasticsearch.enabled=@env.ELASTICSEARCH_ENABLED@
+
diff --git a/src/main/environment/1097_docker.properties b/src/main/environment/1097_docker.properties
index 471665aa..ba65893e 100644
--- a/src/main/environment/1097_docker.properties
+++ b/src/main/environment/1097_docker.properties
@@ -22,3 +22,15 @@ fhir-url=${FHIR_API}
 spring.redis.host=${REDIS_HOST}
 
 cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
+
+
+# Elasticsearch Configuration
+elasticsearch.host=${ELASTICSEARCH_HOST}
+elasticsearch.port=${ELASTICSEARCH_PORT}
+elasticsearch.username=${ELASTICSEARCH_USERNAME}
+elasticsearch.password=${ELASTICSEARCH_PASSWORD}
+elasticsearch.index.beneficiary=${ELASTICSEARCH_INDEX_BENEFICIARY}
+
+# Enable/Disable ES (for gradual rollout)
+elasticsearch.enabled=${ELASTICSEARCH_ENABLED}
+
diff --git a/src/main/environment/1097_example.properties b/src/main/environment/1097_example.properties
index d1f66965..7e188a3e 100644
--- a/src/main/environment/1097_example.properties
+++ b/src/main/environment/1097_example.properties
@@ -19,3 +19,14 @@ fhir-url=http://localhost:8093/
 # Redis Config
 spring.redis.host=localhost
 cors.allowed-origins=http://localhost:*
+
+# Elasticsearch Configuration
+elasticsearch.host=localhost
+elasticsearch.port=9200
+elasticsearch.username=elastic
+elasticsearch.password=piramalES
+elasticsearch.index.beneficiary=beneficiary_index
+
+# Enable/Disable ES (for gradual rollout)
+elasticsearch.enabled=true
+
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index 45018aa6..28eda5ea 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -1,6 +1,6 @@
 server.port=8094
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
+spring.datasource.url=jdbc:mysql://localhost:3306/db_identity
 spring.datasource.username=root
 spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver