WF - Fix expiry roles

WF - Fix expiry roles