diff --git a/mosip-identity-plugin/src/main/resources/application.properties b/mosip-identity-plugin/src/main/resources/application.properties
index a2a5a4e..41ed8a6 100644
--- a/mosip-identity-plugin/src/main/resources/application.properties
+++ b/mosip-identity-plugin/src/main/resources/application.properties
@@ -5,17 +5,17 @@ mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
 mosip.esignet.integration.key-binder=IdaKeyBinderImpl
 mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
 
-mosip.esignet.ida.auth.url=${MOSIP_API_INTERNAL_HOST:http://ida-auth.ida}
-mosip.esignet.ida.otp.url=${MOSIP_API_INTERNAL_HOST:http://ida-otp.ida}
-mosip.esignet.ida.internal.url=${MOSIP_API_INTERNAL_HOST:http://ida-internal.ida}
-mosip.esignet.authmanager.url=${MOSIP_API_INTERNAL_HOST:http://authmanager.kernel}
-mosip.esignet.auditmanager.url=${MOSIP_API_INTERNAL_HOST:http://auditmanager.kernel}
-mosip.esignet.masterdata.url=${MOSIP_API_INTERNAL_HOST:http://masterdata.kernel}
-mosip.signup.idrepo.url=${MOSIP_API_INTERNAL_HOST:http://identity.idrepo}
-mosip.signup.keymanager.url=${MOSIP_API_INTERNAL_HOST:http://keymanager.keymanager}
-mosip.signup.credreq.url=${MOSIP_API_INTERNAL_HOST:http://credentialrequest.idrepo}
-mosip.signup.idgenerator.url=${MOSIP_API_INTERNAL_HOST:http://idgenerator.kernel}
-mosip.signup.fileserver.url=${MOSIP_API_INTERNAL_HOST:http://mosip-file-server.mosip-file-server}
+mosip.esignet.ida.auth.domain=${MOSIP_API_INTERNAL_HOST:http://ida-auth.ida}
+mosip.esignet.ida.otp.domain=${MOSIP_API_INTERNAL_HOST:http://ida-otp.ida}
+mosip.esignet.ida.internal.domain=${MOSIP_API_INTERNAL_HOST:http://ida-internal.ida}
+mosip.esignet.authmanager.domain=${MOSIP_API_INTERNAL_HOST:http://authmanager.kernel}
+mosip.esignet.auditmanager.domain=${MOSIP_API_INTERNAL_HOST:http://auditmanager.kernel}
+mosip.esignet.masterdata.domain=${MOSIP_API_INTERNAL_HOST:http://masterdata.kernel}
+mosip.signup.idrepo.domain=${MOSIP_API_INTERNAL_HOST:http://identity.idrepo}
+mosip.signup.keymanager.domain=${MOSIP_API_INTERNAL_HOST:http://keymanager.keymanager}
+mosip.signup.credreq.domain=${MOSIP_API_INTERNAL_HOST:http://credentialrequest.idrepo}
+mosip.signup.idgenerator.domain=${MOSIP_API_INTERNAL_HOST:http://idgenerator.kernel}
+mosip.signup.fileserver.domain=${MOSIP_API_INTERNAL_HOST:http://mosip-file-server.mosip-file-server}
 
 # IDA integration props
 mosip.esignet.authenticator.ida-auth-id=mosip.identity.kycauth
@@ -24,16 +24,16 @@ mosip.esignet.authenticator.ida-send-otp-id=mosip.identity.otp
 mosip.esignet.authenticator.ida-version=1.0
 mosip.esignet.authenticator.ida.misp-license-key=${mosip.esignet.misp.key}
 mosip.esignet.authenticator.ida-domainUri=${mosip.esignet.domain.url}
-mosip.esignet.authenticator.ida.cert-url=${mosip.signup.fileserver.url}/mosip-certs/ida-partner.cer
-mosip.esignet.authenticator.ida.kyc-auth-url=${mosip.esignet.ida.auth.url}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
-mosip.esignet.authenticator.ida.kyc-auth-url-v2=${mosip.esignet.ida.auth.url}/idauthentication/v1/kyc-auth/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
-mosip.esignet.authenticator.ida.kyc-exchange-url=${mosip.esignet.ida.auth.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
-mosip.esignet.authenticator.ida.kyc-exchange-url-v2=${mosip.esignet.ida.auth.url}/idauthentication/v1/kyc-exchange/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
-mosip.esignet.authenticator.ida.send-otp-url=${mosip.esignet.ida.otp.url}/idauthentication/v1/otp/${mosip.esignet.authenticator.ida.misp-license-key}/
-mosip.esignet.binder.ida.key-binding-url=${mosip.esignet.ida.auth.url}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
-mosip.esignet.authenticator.ida.get-certificates-url=${mosip.esignet.ida.internal.url}/idauthentication/v1/internal/getAllCertificates
-mosip.esignet.authenticator.ida.auth-token-url=${mosip.esignet.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
-mosip.esignet.authenticator.ida.audit-manager-url=${mosip.esignet.auditmanager.url}/v1/auditmanager/audits
+mosip.esignet.authenticator.ida.cert-url=${mosip.signup.fileserver.domain}/mosip-certs/ida-partner.cer
+mosip.esignet.authenticator.ida.kyc-auth-url=${mosip.esignet.ida.auth.domain}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
+mosip.esignet.authenticator.ida.kyc-auth-url-v2=${mosip.esignet.ida.auth.domain}/idauthentication/v1/kyc-auth/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
+mosip.esignet.authenticator.ida.kyc-exchange-url=${mosip.esignet.ida.auth.domain}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
+mosip.esignet.authenticator.ida.kyc-exchange-url-v2=${mosip.esignet.ida.auth.domain}/idauthentication/v1/kyc-exchange/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
+mosip.esignet.authenticator.ida.send-otp-url=${mosip.esignet.ida.otp.domain}/idauthentication/v1/otp/${mosip.esignet.authenticator.ida.misp-license-key}/
+mosip.esignet.binder.ida.key-binding-url=${mosip.esignet.ida.auth.domain}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
+mosip.esignet.authenticator.ida.get-certificates-url=${mosip.esignet.ida.internal.domain}/idauthentication/v1/internal/getAllCertificates
+mosip.esignet.authenticator.ida.auth-token-url=${mosip.esignet.authmanager.domain}/v1/authmanager/authenticate/clientidsecretkey
+mosip.esignet.authenticator.ida.audit-manager-url=${mosip.esignet.auditmanager.domain}/v1/auditmanager/audits
 mosip.esignet.authenticator.ida.client-id=mosip-ida-client
 mosip.esignet.authenticator.ida.secret-key=${mosip.ida.client.secret}
 mosip.esignet.authenticator.ida.app-id=ida
@@ -45,22 +45,22 @@ mosip.signup.integration.impl.basepackage=io.mosip.signup.plugin.mosipid,io.mosi
 mosip.kernel.xsdstorage-uri=classpath:
 mosip.kernel.xsdfile=mosip-cbeff.xsd
 mosip.signup.integration.profile-registry-plugin=MOSIPProfileRegistryPluginImpl
-mosip.signup.idrepo.schema-url=${mosip.esignet.masterdata.url}/v1/masterdata/idschema/latest?schemaVersion=
+mosip.signup.idrepo.schema-url=${mosip.esignet.masterdata.domain}/v1/masterdata/idschema/latest?schemaVersion=
 mosip.signup.idrepo.uin.length=10
 
-mosip.signup.idrepo.get-identity.endpoint=${mosip.signup.idrepo.url}/idrepository/v1/identity/idvid/
-mosip.signup.idrepo.identity.endpoint=${mosip.signup.idrepo.url}/idrepository/v1/identity/v2/
-mosip.signup.idrepo.generate-hash.endpoint=${mosip.signup.keymanager.url}/v1/keymanager/generateArgon2Hash
-mosip.signup.idrepo.get-uin.endpoint=${mosip.signup.idgenerator.url}/v1/idgenerator/uin
-mosip.signup.idrepo.get-status.endpoint=${mosip.signup.credreq.url}/v1/credentialrequest/get/
+mosip.signup.idrepo.get-identity.endpoint=${mosip.signup.idrepo.domain}/idrepository/v1/identity/idvid/
+mosip.signup.idrepo.identity.endpoint=${mosip.signup.idrepo.domain}/idrepository/v1/identity/v2/
+mosip.signup.idrepo.generate-hash.endpoint=${mosip.signup.keymanager.domain}/v1/keymanager/generateArgon2Hash
+mosip.signup.idrepo.get-uin.endpoint=${mosip.signup.idgenerator.domain}/v1/idgenerator/uin
+mosip.signup.idrepo.get-status.endpoint=${mosip.signup.credreq.domain}/v1/credentialrequest/get/
 
 # This is the url to fetch ui-spec from masterdata - 'esignet-signup' in the url should match with domain name of the schema in the masterdata.
-mosip.signup.mosipid.get-ui-spec.endpoint=${mosip.esignet.masterdata.url}/v1/masterdata/uispec/esignet-signup/latest?type=schema
+mosip.signup.mosipid.get-ui-spec.endpoint=${mosip.esignet.masterdata.domain}/v1/masterdata/uispec/esignet-signup/latest?type=schema
 
-mosip.signup.mosipid.dynamic-fields.endpoint=${mosip.esignet.masterdata.url}/v1/masterdata/dynamicfields?pageNumber=%d&pageSize=%d
+mosip.signup.mosipid.dynamic-fields.endpoint=${mosip.esignet.masterdata.domain}/v1/masterdata/dynamicfields?pageNumber=%d&pageSize=%d
 
 # for multiple languages scenario, the languages should be appended followed by ampersand as ?languages=eng&languages=fra&languages=khm
-mosip.signup.mosipid.doc-types-category.endpoint=${mosip.esignet.masterdata.url}/v1/masterdata/applicanttype/000/languages?languages=eng
+mosip.signup.mosipid.doc-types-category.endpoint=${mosip.esignet.masterdata.domain}/v1/masterdata/applicanttype/000/languages?languages=eng
 
 mosip.signup.idrepo.add-identity.request.id=mosip.id.create
 mosip.signup.idrepo.update-identity.request.id=mosip.id.update