DEP-65 workflow fixes