Also backport https://github.com/osbuild/osbuild/pull/1610 Skip one unit test - https://github.com/osbuild/osbuild/issues/1611 Resolves: RHEL-1770
imagebuilder-bot