PRD-5052, PRD-5053 and PRD-5073 - Fixes in ivy configs