diff --git a/mock-identity-system/src/main/resources/application-local.properties b/mock-identity-system/src/main/resources/application.properties
similarity index 67%
rename from mock-identity-system/src/main/resources/application-local.properties
rename to mock-identity-system/src/main/resources/application.properties
index 9fd7b98b..0472a81e 100644
--- a/mock-identity-system/src/main/resources/application-local.properties
+++ b/mock-identity-system/src/main/resources/application.properties
@@ -1,14 +1,12 @@
-##----------------------------------------- Database properties --------------------------------------------------------
+softhsm.mock.identity.system.security.pin=39406032
 
-spring.datasource.url=jdbc:postgresql://localhost:5455/mosip_mockidentitysystem
+##----------------------------------------- Database properties --------------------------------------------------------
+db.dbuser.password=Mosip@123
+mosip.mockidentitysystem.database.hostname=postgres.tfgovidbb.sandbox-playground.com
+mosip.mockidentitysystem.database.port=5432
+spring.datasource.url=jdbc:postgresql://${mosip.mockidentitysystem.database.hostname}:${mosip.mockidentitysystem.database.port}/mosip_mockidentitysystem?currentSchema=mockidentitysystem
 spring.datasource.username=postgres
-spring.datasource.password=mosip123
-spring.datasource.driver-class-name=org.postgresql.Driver
-
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+spring.datasource.password=${db.dbuser.password}
 
 #------------------------------------ Key-manager specific properties --------------------------------------------------
 #Crypto asymmetric algorithm name
@@ -38,9 +36,19 @@ mosip.kernel.crypto.sign-algorithm-name=RS256
 #Certificate Sign algo name
 mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 
-mosip.kernel.keymanager.hsm.config-path=local.p12
-mosip.kernel.keymanager.hsm.keystore-type=PKCS12
-mosip.kernel.keymanager.hsm.keystore-pass=local
+#mosip.kernel.keymanager.hsm.config-path=local.p12
+#mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+#mosip.kernel.keymanager.hsm.keystore-pass=local
+
+#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+# For PKCS11 provide Path of config file.
+# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
+# For Offline & JCE property can be left blank, specified value will be ignored.
+mosip.kernel.keymanager.hsm.config-path=/etc/softhsm2.conf
+# Passkey of keystore for PKCS11, PKCS12
+# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.mock.identity.system.security.pin}
 
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
 mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
@@ -62,6 +70,9 @@ mosip.kernel.keymanager-service-validate-url=https://${mosip.hostname}/keymanage
 mosip.kernel.keymanager.jwtsign.validate.json=false
 mosip.keymanager.dao.enabled=false
 crypto.PrependThumbprint.enable=true
-## ------------------------------------------- Integrations ------------------------------------------------------------
-#Mock IDA integration props
+
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 mosip.esignet.mock.authenticator.ida.otp-channels=email,phone