diff --git a/db_scripts/README.MD b/db_scripts/README.MD
index 5dfd48c4311..e59b4312268 100644
--- a/db_scripts/README.MD
+++ b/db_scripts/README.MD
@@ -1,4 +1,4 @@
-## MOSIP ID Authentication Database (mosip_ida) scripts inventory and deployment guidelines on postgresql database. 
+## MOSIP ID Authentication Database (:mosipdbname) scripts inventory and deployment guidelines on postgresql database. 
 
 #### The details disclosed below gives a clear information on complete database script structure with the instructions for database scripts deployments.
 
@@ -14,7 +14,7 @@
 
 * Database objects related to MOSIP modules are placed in "**mosip_base_directory**>>db_scripts>>mosip_<schema_name> folder on git/repository
 
-**Example:** the id-authentication module script folder is /**mosip_base_directory**>>db_scripts>>mosip_ida where all the database scripts related to id authentication are available.
+**Example:** the id-authentication module script folder is /**mosip_base_directory**>>db_scripts>>:mosipdbname where all the database scripts related to id authentication are available.
 
 * Create a log file directory on DB deployment server before updating the properties file. Please follow the steps to create the same:
  
diff --git a/db_scripts/createIdaNewDB.sh b/db_scripts/createIdaNewDB.sh
index 7a38ab0eae7..29c01750f6a 100644
--- a/db_scripts/createIdaNewDB.sh
+++ b/db_scripts/createIdaNewDB.sh
@@ -8,8 +8,8 @@ if [[ $# -ne 3 ]]; then
 fi
 
 ## set variables
-oldDB=$1;     ## mosip_ida
-newDB=$2;     ## mosip_ida_1
+oldDB=$1;     ## :mosipdbname
+newDB=$2;     ## :mosipdbname_1
 dbPwd=$3
 
 ## create new DB directory
@@ -17,23 +17,23 @@ rm -rf $newDB
 cp -r $oldDB $newDB
 
 ## update DB
-sed -i "s/$oldDB\>/$newDB/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_ida_db.sql;
-sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_ida_ddl_deploy.sql;
-sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_ida_dml_deploy.sql;
-sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_ida_grants.sql;
+sed -i "s/$oldDB\>/$newDB/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/$oldDB/$newDB/g"   $newDB/:mosipdbname_db.sql;
+sed -i "s/$oldDB/$newDB/g"   $newDB/:mosipdbname_ddl_deploy.sql;
+sed -i "s/$oldDB/$newDB/g"   $newDB/:mosipdbname_dml_deploy.sql;
+sed -i "s/$oldDB/$newDB/g"   $newDB/:mosipdbname_grants.sql;
 sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_role_common.sql;
-sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_role_idauser.sql;
+sed -i "s/$oldDB/$newDB/g"   $newDB/mosip_role_:dbuname.sql;
 
 ## update DB properties
-sed -i "s/DB_SERVERIP=.*/DB_SERVERIP=mzworker0.sb/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/DB_PORT=.*/DB_PORT=30090/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/SYSADMIN_PWD=.*/SYSADMIN_PWD=$dbPwd/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/DBADMIN_PWD=.*/DBADMIN_PWD=$dbPwd/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/APPADMIN_PWD=.*/APPADMIN_PWD=$dbPwd/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/DBUSER_PWD=.*/DBUSER_PWD=$dbPwd/g" $newDB/mosip_ida_deploy.properties;
-sed -i "s:BASEPATH=.*:BASEPATH=$PWD:g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/LOG_PATH=.*/LOG_PATH=..\/..\/..\/logs\//g" $newDB/mosip_ida_deploy.properties;
-sed -i "s/DML_FLAG=.*/DML_FLAG=1/g" $newDB/mosip_ida_deploy.properties;
+sed -i "s/DB_SERVERIP=.*/DB_SERVERIP=mzworker0.sb/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/DB_PORT=.*/DB_PORT=30090/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/SYSADMIN_PWD=.*/SYSADMIN_PWD=$dbPwd/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/DBADMIN_PWD=.*/DBADMIN_PWD=$dbPwd/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/APPADMIN_PWD=.*/APPADMIN_PWD=$dbPwd/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/DBUSER_PWD=.*/DBUSER_PWD=$dbPwd/g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s:BASEPATH=.*:BASEPATH=$PWD:g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/LOG_PATH=.*/LOG_PATH=..\/..\/..\/logs\//g" $newDB/:mosipdbname_deploy.properties;
+sed -i "s/DML_FLAG=.*/DML_FLAG=1/g" $newDB/:mosipdbname_deploy.properties;
 
 echo "success";
\ No newline at end of file
diff --git a/db_scripts/mosip_ida/db.sql b/db_scripts/mosip_ida/db.sql
index 79ead0ed7e5..4295b2e591d 100644
--- a/db_scripts/mosip_ida/db.sql
+++ b/db_scripts/mosip_ida/db.sql
@@ -1,15 +1,15 @@
-CREATE DATABASE mosip_ida
+CREATE DATABASE :mosipdbname
 	ENCODING = 'UTF8'
 	LC_COLLATE = 'en_US.UTF-8'
 	LC_CTYPE = 'en_US.UTF-8'
 	TABLESPACE = pg_default
 	OWNER = postgres
 	TEMPLATE  = template0;
-COMMENT ON DATABASE mosip_ida IS 'ID Authorization related requests, transactions and mapping related data like virtual ids, tokens, etc. will be stored in this database';
+COMMENT ON DATABASE :mosipdbname IS 'ID Authorization related requests, transactions and mapping related data like virtual ids, tokens, etc. will be stored in this database';
 
-\c mosip_ida 
+\c :mosipdbname
 
 DROP SCHEMA IF EXISTS ida CASCADE;
 CREATE SCHEMA ida;
 ALTER SCHEMA ida OWNER TO postgres;
-ALTER DATABASE mosip_ida SET search_path TO ida,pg_catalog,public;
+ALTER DATABASE :mosipdbname SET search_path TO ida,pg_catalog,public;
diff --git a/db_scripts/mosip_ida/ddl.sql b/db_scripts/mosip_ida/ddl.sql
index abf8ae7cb0f..567024bd577 100644
--- a/db_scripts/mosip_ida/ddl.sql
+++ b/db_scripts/mosip_ida/ddl.sql
@@ -1,4 +1,4 @@
-\c mosip_ida
+\c :mosipdbname
 
 \ir ddl/ida-auth_transaction.sql
 \ir ddl/ida-uin_auth_lock.sql
diff --git a/db_scripts/mosip_ida/ddl/ida-anonymous_profile.sql b/db_scripts/mosip_ida/ddl/ida-anonymous_profile.sql
index 25e11a6c760..24267b40c87 100644
--- a/db_scripts/mosip_ida/ddl/ida-anonymous_profile.sql
+++ b/db_scripts/mosip_ida/ddl/ida-anonymous_profile.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.anonymous_profile
 -- Purpose    	: anonymous_profile: Anonymous profiling information for reporting purpose.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-api_key_data.sql b/db_scripts/mosip_ida/ddl/ida-api_key_data.sql
index 6a853457d3e..af8a66cfeb6 100644
--- a/db_scripts/mosip_ida/ddl/ida-api_key_data.sql
+++ b/db_scripts/mosip_ida/ddl/ida-api_key_data.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.api_key_data
 
 -- Purpose    	: 
diff --git a/db_scripts/mosip_ida/ddl/ida-auth_transaction.sql b/db_scripts/mosip_ida/ddl/ida-auth_transaction.sql
index 260a2ce7212..535a7189507 100644
--- a/db_scripts/mosip_ida/ddl/ida-auth_transaction.sql
+++ b/db_scripts/mosip_ida/ddl/ida-auth_transaction.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.auth_transaction
 -- Purpose    	: Authentication Transaction : To track all authentication transactions steps / stages in the process flow.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-ca_cert_store.sql b/db_scripts/mosip_ida/ddl/ida-ca_cert_store.sql
index 2487896ab5b..2e2f8606f03 100644
--- a/db_scripts/mosip_ida/ddl/ida-ca_cert_store.sql
+++ b/db_scripts/mosip_ida/ddl/ida-ca_cert_store.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.ca_cert_store
 -- Purpose    	: Certificate Authority Certificate Store: Store details of all the certificate provided by certificate authority which will be used by MOSIP
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql b/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql
index f2cc8474bec..3bc9448dd42 100644
--- a/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql
+++ b/db_scripts/mosip_ida/ddl/ida-credential_event_store.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.credential_event_store
 -- Purpose    	: 
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-data_encrypt_keystore.sql b/db_scripts/mosip_ida/ddl/ida-data_encrypt_keystore.sql
index e2bbd9efffc..81f63f45b07 100644
--- a/db_scripts/mosip_ida/ddl/ida-data_encrypt_keystore.sql
+++ b/db_scripts/mosip_ida/ddl/ida-data_encrypt_keystore.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.data_encrypt_keystore
 -- Purpose    	: Data Encrypt Keystore: Table is used to store the encryption key aliases which is used encrypt the data stored in identity cache table store.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-fk.sql b/db_scripts/mosip_ida/ddl/ida-fk.sql
index 589777f15c1..4deed523405 100644
--- a/db_scripts/mosip_ida/ddl/ida-fk.sql
+++ b/db_scripts/mosip_ida/ddl/ida-fk.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name : 
 -- Purpose    : All the FKs are created separately, not part of create table scripts to ease the deployment process
 --           
@@ -18,4 +18,4 @@ CREATE SEQUENCE BATCH_JOB_SEQ MAXVALUE 9223372036854775807 NO CYCLE;
 -- grants to access all sequences
 GRANT usage, SELECT ON ALL SEQUENCES 
    IN SCHEMA ida
-   TO idauser;
\ No newline at end of file
+   TO :dbuname;
\ No newline at end of file
diff --git a/db_scripts/mosip_ida/ddl/ida-ident_binding_cert_store.sql b/db_scripts/mosip_ida/ddl/ida-ident_binding_cert_store.sql
index e047f16cb1c..ec02cde4903 100644
--- a/db_scripts/mosip_ida/ddl/ida-ident_binding_cert_store.sql
+++ b/db_scripts/mosip_ida/ddl/ida-ident_binding_cert_store.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.ident_binding_cert_store
 -- Purpose    	: ident_binding_cert_store : To store Identity binding certificates.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-identity_cache.sql b/db_scripts/mosip_ida/ddl/ida-identity_cache.sql
index 85ade2b1aef..f74f69114d5 100644
--- a/db_scripts/mosip_ida/ddl/ida-identity_cache.sql
+++ b/db_scripts/mosip_ida/ddl/ida-identity_cache.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.identity_cache
 -- Purpose    	: Identity Cache: Details of UIN stored along with uin data and biometric details, This data is synched from ID Repo whenever it is needed and used for authentication request during validation and response to authentication
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-key_store.sql b/db_scripts/mosip_ida/ddl/ida-key_store.sql
index 4749266941a..d612b9ae7bb 100644
--- a/db_scripts/mosip_ida/ddl/ida-key_store.sql
+++ b/db_scripts/mosip_ida/ddl/ida-key_store.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.key_store
 -- Purpose    	: Key Store: In MOSIP, data related to an individual in stored in encrypted form. This table is to manage all the keys(private and public keys) used.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-misp_license_data.sql b/db_scripts/mosip_ida/ddl/ida-misp_license_data.sql
index a622ad465d0..de1725abcd6 100644
--- a/db_scripts/mosip_ida/ddl/ida-misp_license_data.sql
+++ b/db_scripts/mosip_ida/ddl/ida-misp_license_data.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.misp_license_data
 -- Purpose    	: misp_license_data : 
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-oidc_client_data.sql b/db_scripts/mosip_ida/ddl/ida-oidc_client_data.sql
index d4664bc38af..9c51be0ab35 100644
--- a/db_scripts/mosip_ida/ddl/ida-oidc_client_data.sql
+++ b/db_scripts/mosip_ida/ddl/ida-oidc_client_data.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.oidc_client_data
 -- Purpose    	: oidc_client_data : To store OIDC client details.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql b/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql
index b8bd882b92f..42e2d646307 100644
--- a/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql
+++ b/db_scripts/mosip_ida/ddl/ida-otp_transaction.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.otp_transaction
 -- Purpose    	: OTP Transaction: All OTP related data and validation details are maintained here for ID Authentication.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-partner_data.sql b/db_scripts/mosip_ida/ddl/ida-partner_data.sql
index 950b3d62379..28be06c8392 100644
--- a/db_scripts/mosip_ida/ddl/ida-partner_data.sql
+++ b/db_scripts/mosip_ida/ddl/ida-partner_data.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.partner_data
 
 -- Purpose    	: 
diff --git a/db_scripts/mosip_ida/ddl/ida-partner_mapping.sql b/db_scripts/mosip_ida/ddl/ida-partner_mapping.sql
index 5f48e76d9fc..e958d813bad 100644
--- a/db_scripts/mosip_ida/ddl/ida-partner_mapping.sql
+++ b/db_scripts/mosip_ida/ddl/ida-partner_mapping.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.partner_mapping
 
 -- Purpose    	: 
diff --git a/db_scripts/mosip_ida/ddl/ida-uin_auth_lock.sql b/db_scripts/mosip_ida/ddl/ida-uin_auth_lock.sql
index 1e626cd7359..99cae94fc1c 100644
--- a/db_scripts/mosip_ida/ddl/ida-uin_auth_lock.sql
+++ b/db_scripts/mosip_ida/ddl/ida-uin_auth_lock.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name : ida.uin_auth_lock
 -- Purpose    : UIN Authentication Lock: An individual is provided an option to lock or unlock any of the authentication types that are provided by the system. When an individual locks a particular type of authentication, any requests received by the system will be rejected. The details of the locked authentication types are stored in this table.
 --           
diff --git a/db_scripts/mosip_ida/ddl/ida-uin_hash_salt.sql b/db_scripts/mosip_ida/ddl/ida-uin_hash_salt.sql
index abb185344ff..03fdc1b0257 100644
--- a/db_scripts/mosip_ida/ddl/ida-uin_hash_salt.sql
+++ b/db_scripts/mosip_ida/ddl/ida-uin_hash_salt.sql
@@ -1,5 +1,5 @@
 -- -------------------------------------------------------------------------------------------------
--- Database Name: mosip_ida
+-- Database Name: :mosipdbname
 -- Table Name 	: ida.uin_hash_salt
 -- Purpose    	: UIN Hash Salt: Stores the salt used to hash uin of an individual in the hashing algorithm.
 --           
diff --git a/db_scripts/mosip_ida/deploy.properties b/db_scripts/mosip_ida/deploy.properties
index 84552d73769..8807a69fb63 100644
--- a/db_scripts/mosip_ida/deploy.properties
+++ b/db_scripts/mosip_ida/deploy.properties
@@ -3,4 +3,5 @@ DB_PORT=5432
 SU_USER=postgres
 DEFAULT_DB_NAME=postgres
 MOSIP_DB_NAME=mosip_ida
+DB_UNAME=idauser
 DML_FLAG=1
diff --git a/db_scripts/mosip_ida/deploy.sh b/db_scripts/mosip_ida/deploy.sh
index b781c6f4d3e..3839974fbed 100644
--- a/db_scripts/mosip_ida/deploy.sh
+++ b/db_scripts/mosip_ida/deploy.sh
@@ -22,27 +22,26 @@ echo "Terminated connections"
 
 ## Drop db and role
 echo "Dropping DB"
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql -v mosipdbname=$MOSIP_DB_NAME
 
 echo "Dropping user"
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql -v dbuname=$DB_UNAME
 
 ## Create users
 echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" 
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' -v dbuname=$DB_UNAME
 
 ## Create DB
 echo "Creating DB"
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql 
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql -v mosipdbname=$MOSIP_DB_NAME
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME
 
 ## Grants
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME
 
 ## Populate tables
 if [ ${DML_FLAG} == 1 ]
 then
     echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" 
-    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql 
+    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql -v mosipdbname=$MOSIP_DB_NAME
 fi
-
diff --git a/db_scripts/mosip_ida/dml.sql b/db_scripts/mosip_ida/dml.sql
index 9a5d10038a6..6eac6c890b0 100644
--- a/db_scripts/mosip_ida/dml.sql
+++ b/db_scripts/mosip_ida/dml.sql
@@ -1,4 +1,4 @@
-\c mosip_ida 
+\c :mosipdbname
 
 TRUNCATE TABLE ida.key_policy_def cascade ;
 
diff --git a/db_scripts/mosip_ida/drop_db.sql b/db_scripts/mosip_ida/drop_db.sql
index 221e14ff03a..36d0a024c70 100644
--- a/db_scripts/mosip_ida/drop_db.sql
+++ b/db_scripts/mosip_ida/drop_db.sql
@@ -1,2 +1,2 @@
-DROP DATABASE IF EXISTS mosip_ida;
+DROP DATABASE IF EXISTS :mosipdbname;
 
diff --git a/db_scripts/mosip_ida/drop_role.sql b/db_scripts/mosip_ida/drop_role.sql
index 86e1784d09f..0f6cc8f54bb 100644
--- a/db_scripts/mosip_ida/drop_role.sql
+++ b/db_scripts/mosip_ida/drop_role.sql
@@ -1 +1 @@
-drop role if exists idauser; 
+drop role if exists :dbuname;
diff --git a/db_scripts/mosip_ida/grants.sql b/db_scripts/mosip_ida/grants.sql
index a728c997aea..c92c9f9a001 100644
--- a/db_scripts/mosip_ida/grants.sql
+++ b/db_scripts/mosip_ida/grants.sql
@@ -1,17 +1,17 @@
-\c mosip_ida 
+\c :mosipdbname
 
 GRANT CONNECT
-   ON DATABASE mosip_ida
-   TO idauser;
+   ON DATABASE :mosipdbname
+   TO :dbuname;
 
 GRANT USAGE
    ON SCHEMA ida
-   TO idauser;
+   TO :dbuname;
 
 GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES
    ON ALL TABLES IN SCHEMA ida
-   TO idauser;
+   TO :dbuname;
 
 ALTER DEFAULT PRIVILEGES IN SCHEMA ida 
-	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO idauser;
+	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname;
 
diff --git a/db_scripts/mosip_ida/role_dbuser.sql b/db_scripts/mosip_ida/role_dbuser.sql
index 6972380f905..a84bca18078 100644
--- a/db_scripts/mosip_ida/role_dbuser.sql
+++ b/db_scripts/mosip_ida/role_dbuser.sql
@@ -1,4 +1,4 @@
-CREATE ROLE idauser WITH 
+CREATE ROLE :dbuname WITH
 	INHERIT
 	LOGIN
 	PASSWORD :dbuserpwd;