BUG-11023 Add environment variables