Make app multi-container aware