Update base and builder images accordingly