Adapt to latest osbuild