diff --git a/src/main/environment/1097_ci.properties b/src/main/environment/1097_ci.properties
index d046eeec..0e8deded 100644
--- a/src/main/environment/1097_ci.properties
+++ b/src/main/environment/1097_ci.properties
@@ -2,7 +2,7 @@
 spring.datasource.url=@env.DATABASE_1097_IDENTITY_URL@
 spring.datasource.username=@env.DATABASE_IDENTITY_USERNAME@
 spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 #ELK logging file name
 logging.path=logs/
@@ -23,3 +23,15 @@ 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..88df0354 100644
--- a/src/main/environment/1097_docker.properties
+++ b/src/main/environment/1097_docker.properties
@@ -2,7 +2,7 @@
 spring.datasource.url=${DATABASE_1097_IDENTITY_URL}
 spring.datasource.username=${DATABASE_IDENTITY_USERNAME}
 spring.datasource.password=${DATABASE_IDENTITY_PASSWORD}
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 #ELK logging file name
 logging.path=logs/
@@ -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..ab87d360 100644
--- a/src/main/environment/1097_example.properties
+++ b/src/main/environment/1097_example.properties
@@ -4,7 +4,7 @@ server.port=8095
 spring.datasource.url=jdbc:mysql://localhost:3306/db_1097_identity
 spring.datasource.username=root
 spring.datasource.password=1234
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
 logging.path=logs/
@@ -19,3 +19,16 @@ 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_ci.properties b/src/main/environment/common_ci.properties
index 98736180..e32dc366 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -2,7 +2,7 @@
 spring.datasource.url=@env.DATABASE_IDENTITY_URL@
 spring.datasource.username=@env.DATABASE_IDENTITY_USERNAME@
 spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 #ELK logging file name
 logging.path=logs/
diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties
index 8f66c5b0..07bd53cc 100644
--- a/src/main/environment/common_docker.properties
+++ b/src/main/environment/common_docker.properties
@@ -2,7 +2,7 @@
 spring.datasource.url=${DATABASE_IDENTITY_URL}
 spring.datasource.username=${DATABASE_IDENTITY_USERNAME}
 spring.datasource.password=${DATABASE_IDENTITY_PASSWORD}
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 #ELK logging file name
 logging.path=logs/
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index 45018aa6..b78483f2 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -1,9 +1,9 @@
 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
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
 logging.path=logs/