Update environment variables for v2