update: make environment variables generic