SM-13565 use case yaml fixes