diff --git a/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql b/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql
index 9cda6f93..0cb09a99 100644
--- a/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql
+++ b/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_rollback.sql
@@ -1,4 +1,4 @@
-\c mosip_keymgr
+\c :mosipdbname
 
 REASSIGN OWNED BY postgres TO sysadmin;
 
diff --git a/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql b/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql
index c27c0aa5..97f3c93b 100644
--- a/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql
+++ b/db_upgrade_scripts/mosip_keymgr/sql/1.1.5.5_to_1.2.0.1-B1_upgrade.sql
@@ -1,12 +1,12 @@
-\c mosip_keymgr
+\c :mosipdbname
 
 REASSIGN OWNED BY sysadmin TO postgres;
 
-REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA keymgr FROM keymgruser;
+REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA keymgr FROM :mosipdbname;
 
 REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA keymgr FROM sysadmin;
 
-GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON ALL TABLES IN SCHEMA keymgr TO keymgruser;
+GRANT SELECT, INSERT, TRUNCATE, REFERENCES, UPDATE, DELETE ON ALL TABLES IN SCHEMA keymgr TO :mosipdbname;
 
 GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA keymgr TO postgres;
 
diff --git a/db_upgrade_scripts/mosip_keymgr/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql b/db_upgrade_scripts/mosip_keymgr/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql
index ffb48794..34692a1f 100644
--- a/db_upgrade_scripts/mosip_keymgr/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql
+++ b/db_upgrade_scripts/mosip_keymgr/sql/1.2.0.1-B2_to_1.2.0.1-B3_upgrade.sql
@@ -1,4 +1,4 @@
-\c mosip_keymgr
+\c :mosipdbname
 
 
 
diff --git a/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_rollback.sql b/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_rollback.sql
index 44e75629..78da3b33 100644
--- a/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_rollback.sql
+++ b/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_rollback.sql
@@ -1,5 +1,5 @@
 -- Below script required to rollback from 1.3.0 to 1.3.0-B4
-\c mosip_keymgr
+\c :mosipdbname
 
 COMMENT ON COLUMN keymgr.ca_cert_store.ca_cert_type
     IS NULL;
diff --git a/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_upgrade.sql b/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_upgrade.sql
index 0dc9ee00..54532374 100644
--- a/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_upgrade.sql
+++ b/db_upgrade_scripts/mosip_keymgr/sql/1.2.1.0_to_1.3.0_upgrade.sql
@@ -1,5 +1,5 @@
 -- Below script required to upgrade from 1.3.0-B4 to 1.3.0
-\c mosip_keymgr
+\c :mosipdbname
 
 ALTER TABLE IF EXISTS keymgr.ca_cert_store
     ADD COLUMN ca_cert_type character varying(25);
diff --git a/db_upgrade_scripts/mosip_keymgr/sql/ca_cert_table_update.sql b/db_upgrade_scripts/mosip_keymgr/sql/ca_cert_table_update.sql
index 073781de..05d6a7b0 100644
--- a/db_upgrade_scripts/mosip_keymgr/sql/ca_cert_table_update.sql
+++ b/db_upgrade_scripts/mosip_keymgr/sql/ca_cert_table_update.sql
@@ -1,4 +1,4 @@
-\c mosip_keymgr
+\c :mosipdbname
 
 ALTER TABLE IF EXISTS keymgr.ca_cert_store
     ADD COLUMN ca_cert_type character varying(25);
diff --git a/db_upgrade_scripts/mosip_keymgr/upgrade.properties b/db_upgrade_scripts/mosip_keymgr/upgrade.properties
index 46c3f7a1..51d6134d 100644
--- a/db_upgrade_scripts/mosip_keymgr/upgrade.properties
+++ b/db_upgrade_scripts/mosip_keymgr/upgrade.properties
@@ -1,4 +1,5 @@
-MOSIP_DB_NAME=
+MOSIP_DB_NAME=mosip_keymgr
+DB_UNAME=keymgruser
 DB_SERVERIP=
 DB_PORT=
 SU_USER=postgres
diff --git a/db_upgrade_scripts/mosip_keymgr/upgrade.sh b/db_upgrade_scripts/mosip_keymgr/upgrade.sh
index 1e0619e0..bab1a3b2 100644
--- a/db_upgrade_scripts/mosip_keymgr/upgrade.sh
+++ b/db_upgrade_scripts/mosip_keymgr/upgrade.sh
@@ -21,7 +21,7 @@ echo "Action: $ACTION"
 
 # Terminate existing 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;)
+CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME --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"
 
 # Execute upgrade or rollback
@@ -30,7 +30,7 @@ if [ "$ACTION" == "upgrade" ]; then
   UPGRADE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_upgrade.sql"
   if [ -f "$UPGRADE_SCRIPT_FILE" ]; then
     echo "Executing upgrade script $UPGRADE_SCRIPT_FILE"
-    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 $UPGRADE_SCRIPT_FILE
+    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $UPGRADE_SCRIPT_FILE
   else
     echo "Upgrade script not found, exiting."
     exit 1
@@ -40,7 +40,7 @@ elif [ "$ACTION" == "rollback" ]; then
   REVOKE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_rollback.sql"
   if [ -f "$REVOKE_SCRIPT_FILE" ]; then
     echo "Executing rollback script $REVOKE_SCRIPT_FILE"
-    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 $REVOKE_SCRIPT_FILE
+    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $REVOKE_SCRIPT_FILE
   else
     echo "rollback script not found, exiting."
     exit 1