Use proper environment vars