SM-13386 Workflow Fixes