Merge "[PORTAL] Update image versions"