Add environment variables in the correct place