diff --git a/db_scripts/mosip_hotlist/db.sql b/db_scripts/mosip_hotlist/db.sql
index ed125cff03f..35dc261bb05 100644
--- a/db_scripts/mosip_hotlist/db.sql
+++ b/db_scripts/mosip_hotlist/db.sql
@@ -1,17 +1,16 @@
-CREATE DATABASE mosip_hotlist
-	ENCODING = 'UTF8' 
-	LC_COLLATE = 'en_US.UTF-8' 
-	LC_CTYPE = 'en_US.UTF-8' 
-	TABLESPACE = pg_default 
+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_hotlist IS 'Hotlist data related logs and the data is stored in this database';
 
-\c mosip_hotlist postgres
+\c :mosipdbname postgres
 
 DROP SCHEMA IF EXISTS hotlist CASCADE;
 CREATE SCHEMA hotlist;
 ALTER SCHEMA hotlist OWNER TO postgres;
-ALTER DATABASE mosip_hotlist SET search_path TO hotlist,pg_catalog,public;
-
+ALTER DATABASE :mosipdbname SET search_path TO hotlist,pg_catalog,public;
diff --git a/db_scripts/mosip_hotlist/ddl.sql b/db_scripts/mosip_hotlist/ddl.sql
index b0e7c30f145..7500668066d 100644
--- a/db_scripts/mosip_hotlist/ddl.sql
+++ b/db_scripts/mosip_hotlist/ddl.sql
@@ -1,4 +1,4 @@
-\c mosip_hotlist 
+\c :mosipdbname
 
 \ir ddl/hotlist-hotlist.sql
-\ir ddl/hotlist-hotlist_h.sql
+\ir ddl/hotlist-hotlist_h.sql
\ No newline at end of file
diff --git a/db_scripts/mosip_hotlist/deploy.properties b/db_scripts/mosip_hotlist/deploy.properties
index 82bddf16894..7fd2c427a21 100644
--- a/db_scripts/mosip_hotlist/deploy.properties
+++ b/db_scripts/mosip_hotlist/deploy.properties
@@ -3,4 +3,5 @@ DB_PORT=5432
 SU_USER=postgres
 DEFAULT_DB_NAME=postgres
 MOSIP_DB_NAME=mosip_hotlist
-DML_FLAG=0
+DB_UNAME=hotlistuser
+DML_FLAG=0
\ No newline at end of file
diff --git a/db_scripts/mosip_hotlist/deploy.sh b/db_scripts/mosip_hotlist/deploy.sh
index ef9cc3c091e..c96c9559604 100644
--- a/db_scripts/mosip_hotlist/deploy.sh
+++ b/db_scripts/mosip_hotlist/deploy.sh
@@ -16,29 +16,28 @@ else
 fi
 
 ## Terminate existing connections
-echo "Terminating active connections" 
+echo "Terminating active connections"
 CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;)
 echo "Terminated connections"
 
 ## Drop db and role
-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_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_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 drop_role.sql -v dbuname=$DB_UNAME
 
 ## Create users
 echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" | tee
-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
-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 
+    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
 fi
-
diff --git a/db_scripts/mosip_hotlist/drop_db.sql b/db_scripts/mosip_hotlist/drop_db.sql
index 2b1c5801881..e7d03db099b 100644
--- a/db_scripts/mosip_hotlist/drop_db.sql
+++ b/db_scripts/mosip_hotlist/drop_db.sql
@@ -1,2 +1 @@
-DROP DATABASE IF EXISTS mosip_hotlist;
-
+DROP DATABASE IF EXISTS :mosipdbname;
diff --git a/db_scripts/mosip_hotlist/drop_role.sql b/db_scripts/mosip_hotlist/drop_role.sql
index 1bf6b2b47cc..8f85d64d5ac 100644
--- a/db_scripts/mosip_hotlist/drop_role.sql
+++ b/db_scripts/mosip_hotlist/drop_role.sql
@@ -1 +1 @@
-drop role if exists hotlistuser;
+drop role if exists :dbuname;
\ No newline at end of file
diff --git a/db_scripts/mosip_hotlist/grants.sql b/db_scripts/mosip_hotlist/grants.sql
index 79d1a2e6704..220c738f483 100644
--- a/db_scripts/mosip_hotlist/grants.sql
+++ b/db_scripts/mosip_hotlist/grants.sql
@@ -1,18 +1,18 @@
-\c mosip_hotlist
+\c :mosipdbname
 
 GRANT CONNECT
-   ON DATABASE mosip_hotlist
-   TO hotlistuser;
+   ON DATABASE :mosipdbname
+   TO :dbuname;
 
 GRANT USAGE
    ON SCHEMA hotlist
-   TO hotlistuser;
+   TO :dbuname;
 
 
 GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES
-   ON ALL TABLES IN SCHEMA hotlist 
-   TO hotlistuser;
+      ON ALL TABLES IN SCHEMA hotlist
+          TO :dbuname;
 
-ALTER DEFAULT PRIVILEGES IN SCHEMA hotlist 
-	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO hotlistuser;
+ALTER DEFAULT PRIVILEGES IN SCHEMA hotlist
+	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname;
 
diff --git a/db_scripts/mosip_hotlist/role_dbuser.sql b/db_scripts/mosip_hotlist/role_dbuser.sql
index dcb9413964e..594b87946e6 100644
--- a/db_scripts/mosip_hotlist/role_dbuser.sql
+++ b/db_scripts/mosip_hotlist/role_dbuser.sql
@@ -1,4 +1,4 @@
-CREATE ROLE hotlistuser WITH 
-	INHERIT
-	LOGIN
-	PASSWORD :dbuserpwd;
+CREATE ROLE :dbuname WITH
+    INHERIT
+    LOGIN
+    PASSWORD :dbuserpwd;
\ No newline at end of file
diff --git a/db_scripts/mosip_master/db.sql b/db_scripts/mosip_master/db.sql
index d5930017282..8dd1c50f270 100644
--- a/db_scripts/mosip_master/db.sql
+++ b/db_scripts/mosip_master/db.sql
@@ -1,17 +1,16 @@
-CREATE DATABASE mosip_master
-	ENCODING = 'UTF8' 
-	LC_COLLATE = 'en_US.UTF-8' 
-	LC_CTYPE = 'en_US.UTF-8' 
-	TABLESPACE = pg_default 
+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_master IS 'Masterdata related logs and the data is stored in this database';
+COMMENT ON DATABASE :mosipdbname IS 'Masterdata related logs and the data is stored in this database';
 
-\c mosip_master postgres
+\c :mosipdbname postgres
 
 DROP SCHEMA IF EXISTS master CASCADE;
 CREATE SCHEMA master;
 ALTER SCHEMA master OWNER TO postgres;
-ALTER DATABASE mosip_master SET search_path TO master,pg_catalog,public;
-
+ALTER DATABASE :mosipdbname SET search_path TO master,pg_catalog,public;
diff --git a/db_scripts/mosip_master/ddl.sql b/db_scripts/mosip_master/ddl.sql
index 54d97e479ba..c02393df574 100644
--- a/db_scripts/mosip_master/ddl.sql
+++ b/db_scripts/mosip_master/ddl.sql
@@ -1,4 +1,4 @@
-\c mosip_master 
+\c :mosipdbname
 
 \ir ddl/master-app_authentication_method.sql
 \ir ddl/master-app_detail.sql
@@ -75,4 +75,4 @@
 
 \ir ddl/master-permitted_local_config.sql
 
-\ir ddl/master-applicant_login_detail.sql
+\ir ddl/master-applicant_login_detail.sql
\ No newline at end of file
diff --git a/db_scripts/mosip_master/ddl/master-batch-fk.sql b/db_scripts/mosip_master/ddl/master-batch-fk.sql
index 816d8731c1e..194cd96d21d 100644
--- a/db_scripts/mosip_master/ddl/master-batch-fk.sql
+++ b/db_scripts/mosip_master/ddl/master-batch-fk.sql
@@ -4,6 +4,6 @@ CREATE SEQUENCE master.BATCH_JOB_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO C
 CREATE SEQUENCE master.BATCH_JOB_SEQ MAXVALUE 9223372036854775807 NO CYCLE;
 
 -- grants to access all sequences
-GRANT usage, SELECT ON ALL SEQUENCES 
-   IN SCHEMA master
-   TO masteruser;
+GRANT usage, SELECT ON ALL SEQUENCES
+    IN SCHEMA master
+    TO :dbuname;
diff --git a/db_scripts/mosip_master/deploy.properties b/db_scripts/mosip_master/deploy.properties
index ee923ea139e..89d4e682f09 100644
--- a/db_scripts/mosip_master/deploy.properties
+++ b/db_scripts/mosip_master/deploy.properties
@@ -3,4 +3,5 @@ DB_PORT=5432
 SU_USER=postgres
 DEFAULT_DB_NAME=postgres
 MOSIP_DB_NAME=mosip_master
-DML_FLAG=1
+DB_UNAME=masteruser
+DML_FLAG=1
\ No newline at end of file
diff --git a/db_scripts/mosip_master/deploy.sh b/db_scripts/mosip_master/deploy.sh
index ef9cc3c091e..5cdc83323cb 100644
--- a/db_scripts/mosip_master/deploy.sh
+++ b/db_scripts/mosip_master/deploy.sh
@@ -16,29 +16,28 @@ else
 fi
 
 ## Terminate existing connections
-echo "Terminating active connections" 
+echo "Terminating active connections"
 CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;)
 echo "Terminated connections"
 
 ## Drop db and role
-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_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_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 drop_role.sql -v dbuname=$DB_UNAME
 
 ## Create users
 echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" | tee
-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
-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 
+    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 -v mosipdbname=$MOSIP_DB_NAME -f dml.sql -v mosipdbname=$MOSIP_DB_NAME
 fi
-
diff --git a/db_scripts/mosip_master/dml.sql b/db_scripts/mosip_master/dml.sql
index 3f3f3219deb..b15807260ee 100644
--- a/db_scripts/mosip_master/dml.sql
+++ b/db_scripts/mosip_master/dml.sql
@@ -1,4 +1,4 @@
-\c mosip_master 
+\c :mosipdbname
 
 -------------- Level 1 data load scripts ------------------------
 
@@ -70,20 +70,3 @@ TRUNCATE TABLE master.screen_detail cascade ;
 TRUNCATE TABLE master.screen_authorization cascade ;
 
 \COPY master.screen_authorization (screen_id,role_code,lang_code,is_permitted,is_active,cr_by,cr_dtimes) FROM './dml/master-screen_authorization.csv' delimiter ',' HEADER  csv;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/db_scripts/mosip_master/drop_db.sql b/db_scripts/mosip_master/drop_db.sql
index 11fb3e816df..e7d03db099b 100644
--- a/db_scripts/mosip_master/drop_db.sql
+++ b/db_scripts/mosip_master/drop_db.sql
@@ -1,2 +1 @@
-DROP DATABASE IF EXISTS mosip_master;
-
+DROP DATABASE IF EXISTS :mosipdbname;
diff --git a/db_scripts/mosip_master/drop_role.sql b/db_scripts/mosip_master/drop_role.sql
index 8d7d1110b35..0f6cc8f54bb 100644
--- a/db_scripts/mosip_master/drop_role.sql
+++ b/db_scripts/mosip_master/drop_role.sql
@@ -1 +1 @@
-drop role if exists masteruser;
+drop role if exists :dbuname;
diff --git a/db_scripts/mosip_master/grants.sql b/db_scripts/mosip_master/grants.sql
index 513660623f2..f545fd24260 100644
--- a/db_scripts/mosip_master/grants.sql
+++ b/db_scripts/mosip_master/grants.sql
@@ -1,17 +1,17 @@
-\c mosip_master 
+\c :mosipdbname
 
 GRANT CONNECT
    ON DATABASE mosip_master
-   TO masteruser;
+   TO :dbuname;
 
 GRANT USAGE
    ON SCHEMA master
-   TO masteruser;
+   TO :dbuname;
 
 GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES
-   ON ALL TABLES IN SCHEMA master
-   TO masteruser;
+      ON ALL TABLES IN SCHEMA master
+          TO :dbuname;
 
-ALTER DEFAULT PRIVILEGES IN SCHEMA master 
-	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO masteruser;
+ALTER DEFAULT PRIVILEGES IN SCHEMA master
+	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname;
 
diff --git a/db_scripts/mosip_master/role_dbuser.sql b/db_scripts/mosip_master/role_dbuser.sql
index d8fd9d81aef..b0bb1617974 100644
--- a/db_scripts/mosip_master/role_dbuser.sql
+++ b/db_scripts/mosip_master/role_dbuser.sql
@@ -1,4 +1,4 @@
-CREATE ROLE masteruser WITH 
-	INHERIT
-	LOGIN
-	PASSWORD :dbuserpwd;
+CREATE ROLE :dbuname WITH
+    INHERIT
+    LOGIN
+    PASSWORD :'dbuserpwd';