Fix ServiceRegistry and workflow definition