Prereq: https://gitlab.isc.org/isc-projects/images/-/merge_requests/323
Backport of MR !9116 (merged)