Use environment variables instead of hard coded versions