This patch is build upon the proposal of Ben on the same topic. I've created test images in my personal tenants and created VMs from them for cc7 and c8 and they appear to work. The error reported by Lionel is gone.
Please have a look if that makes sense.