MAESTRO-2970 tidy up manifest and remove bad image