[OS-BUILD PATCHv2] Combine duplicate configs across ark and fedora into common