Merge pull request #2329 from Mafyuh/renovate/oci-8.x