Note: Per another open pull request, @container-* are going to be renamed.