Make the env vars consistent