Streamline our image use to new official images