Update to use a more generic env. var