Update to new workflow