Updatd connections to use environment variables