(Minor) Updated to use env. vars of the server