diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index 29a976b9..fe28a9a4 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -6,36 +6,36 @@ spring.datasource.password=@env.DATABASE_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 ## Carestream URLs, local
-carestreamOrderCreateURL=@env.COMMON_API_BASE_URL@/carestream/createOrder
+carestreamOrderCreateURL=@env.COMMON_API@/carestream/createOrder
 
 ## Identity - Common URLs
 #  Registration
-registrationUrl =@env.COMMON_API_BASE_URL@/beneficiary/createBeneficiary
+registrationUrl =@env.COMMON_API@/beneficiary/createBeneficiary
 
-registrarQuickSearchByIdUrl =@env.COMMON_API_BASE_URL@/beneficiary/searchUserByID
+registrarQuickSearchByIdUrl =@env.COMMON_API@/beneficiary/searchUserByID
 
-registrarQuickSearchByPhoneNoUrl =@env.COMMON_API_BASE_URL@/beneficiary/searchUserByPhone
+registrarQuickSearchByPhoneNoUrl =@env.COMMON_API@/beneficiary/searchUserByPhone
 
 getBenImageFromIdentity =@env.IDENTITY_API_BASE_URL@/id/benImageByBenRegID
 
-beneficiaryEditUrl =@env.COMMON_API_BASE_URL@/beneficiary/updateBenefciaryDetails
+beneficiaryEditUrl =@env.COMMON_API@/beneficiary/updateBenefciaryDetails
 
-registrarAdvanceSearchUrl =@env.COMMON_API_BASE_URL@/beneficiary/searchBeneficiary
+registrarAdvanceSearchUrl =@env.COMMON_API@/beneficiary/searchBeneficiary
 
 ## Data Sync API, central
-dataSyncUploadUrl=@env.MMU_API_BASE_URL@/dataSync/van-to-server
+dataSyncUploadUrl=@env.MMU_API@/dataSync/van-to-server
 
 ## Data download API, central
-dataSyncDownloadUrl=@env.MMU_API_BASE_URL@/dataSync/server-to-van
+dataSyncDownloadUrl=@env.MMU_API@/dataSync/server-to-van
 
 ## TC specialist slot booking, # not required
-tcSpecialistSlotBook=@env.TM_API_BASE_URL@/schedule/bookSlot
+tcSpecialistSlotBook=@env.TM_API@/schedule/bookSlot
 
 ## TC specialist slot cancelling, # not required
-tcSpecialistSlotCancel=@env.TM_API_BASE_URL@/schedule/cancelBookedSlot
+tcSpecialistSlotCancel=@env.TM_API@/schedule/cancelBookedSlot
 
 ## benGenUrl, common, central
-benGenUrlCentral=@env.COMMON_API_BASE_URL@/beneficiary/generateBeneficiaryIDs
+benGenUrlCentral=@env.COMMON_API@/beneficiary/generateBeneficiaryIDs
 
 ## benImportUrl, identity, local
 benImportUrlLocal=@env.IDENTITY_API_BASE_URL@/id/saveGeneratedBenIDToLocalServer
@@ -43,13 +43,13 @@ mmucentralserver = @env.MMU_CENTRAL_SERVER@/common/get/Case-sheet/centralServerT
 
 tmCentralServer = @env.TM_CENTRAL_SERVER@/common/get/Case-sheet/printData
 
-specialistSign=@env.COMMON_API_BASE_URL@/signature1/getSignClass
+specialistSign=@env.COMMON_API@/signature1/getSignClass
 
 ## inventory transaction download URL, central, mmu
-dataSyncTransactionDownloadUrl=@env.MMU_API_BASE_URL@/dataSync/server-to-van-transactional
+dataSyncTransactionDownloadUrl=@env.MMU_API@/dataSync/server-to-van-transactional
 
 ## inventory transaction processed flag update URL, central, mmu
-dataSyncProcessedFlagUpdate=@env.MMU_API_BASE_URL@/dataSync/updateProcessedFlagPostDownload
+dataSyncProcessedFlagUpdate=@env.MMU_API@/dataSync/updateProcessedFlagPostDownload
 
 
 fileBasePath =@env.MMU_FILE_BASE_PATH@
@@ -71,7 +71,7 @@ serverUserName=@env.FILE_SYNC_SERVER_USERNAME@
 serverPassword=@env.FILE_SYNC_SERVER_PASSWORD@
 localFolderToSync=@env.LOCAL_FOLDER_TO_SYNC@
 serverFolder=MMUSync
-getServerCredentialURL=@env.MMU_API_BASE_URL@/fileSyncController/getServerCredential
+getServerCredentialURL=@env.MMU_API@/fileSyncController/getServerCredential
 tmReferCheckValue=TM
 ### Redis IP
 spring.redis.host=localhost