Fix environment variable endpoints

AFAICT from experimentation these are the correct endpoints.