Pass environment variables correctly