MAESTRO-3162 Images for legacy CEE