Update image versions and fix as per code review