Use proper env vars