MYLOC-59 - Simplify container setup