Refactored to use separate container, image and repo names