Temporary workaround for race condition when deploying tasks
@wip on group markers