DDBNEXT-978: Refactoring Images