Improve use of JetContainers, fix cluster name in AddTasks