Goes together with:
containers!87 (merged)
https://gitlab.cee.redhat.com/cki-project/deployment-all/merge_requests/109