Fix the yq based validation checks