Moved to common image setup