This workflow feels a bit strange. Maybe it should be a listener. I think you've done that somewhere else, but can't remember exactly. Maybe it was in a different branch.