Fix env vars from cattle rename