Make use of the new env var