extend annotate-loops to all container nodes