add container-based infrastructure support