Adds support for container-based infrastructure