diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index 58d2ee67..86cc945c 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -151,4 +151,4 @@ updateGrievanceTransactionDetails=@env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr109
 grievanceUserName = @env.GRIEVANCE_USERNAME@
 grievancePassword = @env.GRIEVANCE_PASSWORD@
 grievanceUserAuthenticate = @env.GRIEVANCE_USER_AUTHENTICATE@
-grievanceDataSyncDuration = 15
\ No newline at end of file
+grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index bbf103b1..0ee3e6cd 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -180,4 +180,4 @@ grievanceUserName = <Enter Grievance username>
 grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
-grievanceDataSyncDuration = 15
\ No newline at end of file
+grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index 6aecdd2e..1f1e272b 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -124,4 +124,4 @@ grievanceUserName = <Enter Grievance username>
 grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
-grievanceDataSyncDuration = 15
\ No newline at end of file
+grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index 17453b2c..41cb9b70 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -181,4 +181,4 @@ grievanceUserName = <Enter Grievance username>
 grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
-grievanceDataSyncDuration = 15
\ No newline at end of file
+grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index 5e616d3c..bb8b53de 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -153,4 +153,4 @@ grievanceUserName = <Enter Grievance username>
 grievancePassword = <Enter Grievance password>
 
 grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
-grievanceDataSyncDuration = 15
\ No newline at end of file
+grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 9396f5e7..696c1830 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -117,22 +117,22 @@ enableIPValidation=false
 iemr.extend.expiry.time.changePassword=true
 iemr.session.expiry.time.changePassword=600
 
-identity-api-url-advancesearch =IDENTITY_API_URL/id/advanceSearch
-identity-api-url-getByBenRegIdList =IDENTITY_API_URL/id/getByBenRegIdList
-identity-api-url-getByPartialBenRegIdList =IDENTITY_API_URL/id/getByPartialBenRegIdList
-identity-api-url-getByPhoneNum =IDENTITY_API_URL/id/getByPhoneNum?phoneNum=
-identity-api-url-getByBenId =IDENTITY_API_URL/id/getByBenId?benId=
-identity-api-url-getByBenRegId =IDENTITY_API_URL/id/getByBenRegId?benRegId=
-identity-api-url-benCreate =IDENTITY_API_URL/id/create
-identity-api-url-benEdit =IDENTITY_API_URL/id/edit
-identity-api-url-benEditEducationCommunity=IDENTITY_API_URL/id/editEducationOrCommunity
-
-identity-api-url-getByFamilyId=IDENTITY_API_URL/id/searchByFamilyId?familyId=
-identity-api-url-getByGovIdentity=IDENTITY_API_URL/id/searhByGovIdentity?identity=
+identity-api-url-advancesearch =IDENTITY_BASE_URL/id/advanceSearch
+identity-api-url-getByBenRegIdList =IDENTITY_BASE_URL/id/getByBenRegIdList
+identity-api-url-getByPartialBenRegIdList =IDENTITY_BASE_URL/id/getByPartialBenRegIdList
+identity-api-url-getByPhoneNum =IDENTITY_BASE_URL/id/getByPhoneNum?phoneNum=
+identity-api-url-getByBenId =IDENTITY_BASE_URL/id/getByBenId?benId=
+identity-api-url-getByBenRegId =IDENTITY_BASE_URL/id/getByBenRegId?benRegId=
+identity-api-url-benCreate =IDENTITY_BASE_URL/id/create
+identity-api-url-benEdit =IDENTITY_BASE_URL/id/edit
+identity-api-url-benEditEducationCommunity=IDENTITY_BASE_URL/id/editEducationOrCommunity
+
+identity-api-url-getByFamilyId=IDENTITY_BASE_URL/id/searchByFamilyId?familyId=
+identity-api-url-getByGovIdentity=IDENTITY_BASE_URL/id/searchByGovIdentity?identity=
 
 ## ABHA id based search URL
-identity-api-url-getByHealthID=IDENTITY_API_URL/id/getByAbhaAddress?healthID=
-identity-api-url-getByHealthIDNo=IDENTITY_API_URL/id/getByAbhaIdNo?healthIDNo=
+identity-api-url-getByHealthID=IDENTITY_BASE_URL/id/getByAbhaAddress?healthID=
+identity-api-url-getByHealthIDNo=IDENTITY_BASE_URL/id/getByAbhaIdNo?healthIDNo=
 
 
 #### Max retry count