Updated to use Postgres as DB in all environments