fix env var names thanks to https://github.com/phstc