Merge "[OOF] Update image versions"