Merge "update Environment variable for DB"