Fix remaining use of @@container

[#63497380]