EUCA-9072: Upgrade entities for PV images