Tweak to V5 config