Related to https://pagure.io/fedora-infrastructure/issue/11599
rebased onto d6ee6aa6cb14558461341a83aa22bd7f44fc18b8
Pull-Request has been merged by abompard
Related to https://pagure.io/fedora-infrastructure/issue/11599