FIX: Set env vars in same place