Change database to obtain password from env
Final merge from develop before deleting develop