updated workflow to common scheme