SM-13386 yaml fixes