Switch to container-based infrastructure