From 58a2497640ed1569c2c14233dda4351247ec7bea Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jan 17 2023 11:19:47 +0000
Subject: Split out repositories into separate files


This allows using the repository files from other tools using dnf's
reposdir= option.

To keep rpmdistro-query usable from a repository checkout, we calculate
the location of the repository directory in the rpmdistro-repoquery
script based on the path of the given config.

Instead of preprocessing the config files for mageia and sle-bci, we
use dnf's support for setting variables via environment variables to
set the necessary variables directly from the rpmdistro-repoquery script
and get rid of rpmdistro-gendnfconf.

---

diff --git a/README.md b/README.md
index 32f4bfd..4265a9a 100644
--- a/README.md
+++ b/README.md
@@ -51,22 +51,3 @@ $ ./rpmdistro-repoquery ./distros/opensuse-tumbleweed-snapshot.conf 20190423 [<r
 ```
 
 A [list of available Tumbleweed snapshots](http://download.opensuse.org/history/list) to query is published by openSUSE.
-
-## Mageia specific notes
-
-For Mageia, the configuration needs to be generated first:
-
-```bash
-$ ./rpmdistro-gendnfconf -d mageia -r 7 -o distro.conf
-$ ./rpmdistro-repoquery ./distro.conf 7 [<repoquery options> ...] <pkg-or-file-path>
-
-```
-
-## SLE BCI specific notes
-
-For SLE BCI, the configuration needs to be generated first:
-
-```bash
-$ ./rpmdistro-gendnfconf -d sle-bci -r 15.3 -o distro.conf
-$ ./rpmdistro-repoquery ./distro.conf 15.3 [<repoquery options> ...] <pkg-or-file-path>
-```
diff --git a/distros/centos-legacy.conf b/distros/centos-legacy.conf
index 58b2da4..aa8f51f 100644
--- a/distros/centos-legacy.conf
+++ b/distros/centos-legacy.conf
@@ -10,30 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=0
 mdpolicy=group:primary
-
-# repos
-[centos]
-name=centos
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever
-gpgcheck=1
-
-[updates]
-name=updates
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever
-gpgcheck=1
-
-[extras]
-name=extras
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever
-gpgcheck=1
-
-[epel]
-name=epel
-metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
-gpgcheck=1
-
diff --git a/distros/centos-legacy/centos-legacy.repo b/distros/centos-legacy/centos-legacy.repo
new file mode 100644
index 0000000..f87b0c9
--- /dev/null
+++ b/distros/centos-legacy/centos-legacy.repo
@@ -0,0 +1,18 @@
+[centos]
+name=centos
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever
+gpgcheck=1
+
+[updates]
+name=updates
+enabled=1
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever
+gpgcheck=1
+
+[extras]
+name=extras
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever
+gpgcheck=1
diff --git a/distros/centos-legacy/epel.repo b/distros/centos-legacy/epel.repo
new file mode 100644
index 0000000..2c6aebe
--- /dev/null
+++ b/distros/centos-legacy/epel.repo
@@ -0,0 +1,6 @@
+[epel]
+name=epel
+metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+gpgcheck=1
+
diff --git a/distros/centos-stream-legacy.conf b/distros/centos-stream-legacy.conf
index 02b743c..408f022 100644
--- a/distros/centos-stream-legacy.conf
+++ b/distros/centos-stream-legacy.conf
@@ -10,139 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-[Stream-BaseOS]
-name=CentOS-Stream-$releasever - Base
-baseurl=http://mirror.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-skip_if_unavailable=False
-
-[Stream-AppStream]
-name=CentOS-Stream-$releasever - AppStream
-baseurl=http://mirror.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
-gpgcheck=1
-enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[Stream-PowerTools]
-name=CentOS-Stream-$releasever - PowerTools
-baseurl=http://mirror.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
-gpgcheck=1
-enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[Stream-centosplus]
-name=CentOS-Stream-$releasever - Plus
-baseurl=http://mirror.centos.org/centos/$releasever-stream/centosplus/$basearch/os/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[cr]
-name=CentOS-$releasever - cr
-baseurl=http://mirror.centos.org/centos/$releasever/cr/$basearch/os/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[epel]
-name=epel
-metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
-gpgcheck=1
-skip_if_unavailable=False
-
-[epel-next]
-name=Extra Packages for Enterprise Linux $releasever - Next - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch
-enabled=1
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
-gpgcheck=1
-skip_if_unavailable=False
-
-# SIG repos
-## Hyperscale
-[centos-hyperscale]
-name=CentOS Stream $releasever - Hyperscale
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-main
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-experimental]
-name=CentOS Stream $releasever - Hyperscale Experimental
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-experimental
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-# These contain packages meant for Facebook use; might not be suitable for general use
-[centos-hyperscale-facebook]
-name=CentOS Stream $releasever - Hyperscale Facebook
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-facebook
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-hotfixes]
-name=CentOS Stream $releasever - Hyperscale Hotfixes
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-hotfixes
-gpgcheck=1
-enabled=0
-module_hotfixes=1
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-# These contain packages meant for Intel use; might not be suitable for general use
-[centos-hyperscale-intel]
-name=CentOS Stream $releasever - Hyperscale Intel
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-intel
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-spin]
-name=CentOS Stream $releasever - Hyperscale Spin
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-spin
-gpgcheck=1
-enabled=0
-priority=50
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-## Hyperscale test repos
-[centos-hyperscale-testing]
-name=CentOS Stream $releasever - Hyperscale - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-main/
-gpgcheck=0
-priority=50
-enabled=0
-
-[centos-hyperscale-experimental-testing]
-name=CentOS Stream $releasever - Hyperscale Experimental - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-experimental/
-gpgcheck=0
-priority=50
-enabled=0
-
-# These contain packages meant for Facebook use; might not be suitable for general use
-[centos-hyperscale-facebook-testing]
-name=CentOS Stream $releasever - Hyperscale Facebook - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-facebook/
-gpgcheck=0
-priority=50
-enabled=0
-
-# These contain packages meant for Intel use; might not be suitable for general use
-[centos-hyperscale-intel-testing]
-name=CentOS Stream $releasever - Hyperscale Intel - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-intel/
-gpgcheck=0
-priority=50
-enabled=0
-
-[centos-hyperscale-spin-testing]
-name=CentOS Stream $releasever - Hyperscale Spin - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-spin/
-gpgcheck=0
-priority=50
-enabled=0
diff --git a/distros/centos-stream-legacy/centos-stream-legacy.repo b/distros/centos-stream-legacy/centos-stream-legacy.repo
new file mode 100644
index 0000000..2765867
--- /dev/null
+++ b/distros/centos-stream-legacy/centos-stream-legacy.repo
@@ -0,0 +1,34 @@
+[Stream-BaseOS]
+name=CentOS-Stream-$releasever - Base
+baseurl=http://mirror.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+skip_if_unavailable=False
+
+[Stream-AppStream]
+name=CentOS-Stream-$releasever - AppStream
+baseurl=http://mirror.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+
+[Stream-PowerTools]
+name=CentOS-Stream-$releasever - PowerTools
+baseurl=http://mirror.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+
+[Stream-centosplus]
+name=CentOS-Stream-$releasever - Plus
+baseurl=http://mirror.centos.org/centos/$releasever-stream/centosplus/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+
+[cr]
+name=CentOS-$releasever - cr
+baseurl=http://mirror.centos.org/centos/$releasever/cr/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
diff --git a/distros/centos-stream-legacy/epel.repo b/distros/centos-stream-legacy/epel.repo
new file mode 100644
index 0000000..bc313fa
--- /dev/null
+++ b/distros/centos-stream-legacy/epel.repo
@@ -0,0 +1,14 @@
+[epel]
+name=epel
+metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+gpgcheck=1
+skip_if_unavailable=False
+
+[epel-next]
+name=Extra Packages for Enterprise Linux $releasever - Next - $basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+gpgcheck=1
+skip_if_unavailable=False
diff --git a/distros/centos-stream-legacy/hyperscale.repo b/distros/centos-stream-legacy/hyperscale.repo
new file mode 100644
index 0000000..947fc87
--- /dev/null
+++ b/distros/centos-stream-legacy/hyperscale.repo
@@ -0,0 +1,83 @@
+[centos-hyperscale]
+name=CentOS Stream $releasever - Hyperscale
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-main
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-experimental]
+name=CentOS Stream $releasever - Hyperscale Experimental
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-experimental
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+# These contain packages meant for Facebook use; might not be suitable for general use
+[centos-hyperscale-facebook]
+name=CentOS Stream $releasever - Hyperscale Facebook
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-facebook
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-hotfixes]
+name=CentOS Stream $releasever - Hyperscale Hotfixes
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-hotfixes
+gpgcheck=1
+enabled=0
+module_hotfixes=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+# These contain packages meant for Intel use; might not be suitable for general use
+[centos-hyperscale-intel]
+name=CentOS Stream $releasever - Hyperscale Intel
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-intel
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-spin]
+name=CentOS Stream $releasever - Hyperscale Spin
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=hyperscale-packages-spin
+gpgcheck=1
+enabled=0
+priority=50
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+## Hyperscale test repos
+[centos-hyperscale-testing]
+name=CentOS Stream $releasever - Hyperscale - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-main/
+gpgcheck=0
+priority=50
+enabled=0
+
+[centos-hyperscale-experimental-testing]
+name=CentOS Stream $releasever - Hyperscale Experimental - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-experimental/
+gpgcheck=0
+priority=50
+enabled=0
+
+# These contain packages meant for Facebook use; might not be suitable for general use
+[centos-hyperscale-facebook-testing]
+name=CentOS Stream $releasever - Hyperscale Facebook - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-facebook/
+gpgcheck=0
+priority=50
+enabled=0
+
+# These contain packages meant for Intel use; might not be suitable for general use
+[centos-hyperscale-intel-testing]
+name=CentOS Stream $releasever - Hyperscale Intel - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-intel/
+gpgcheck=0
+priority=50
+enabled=0
+
+[centos-hyperscale-spin-testing]
+name=CentOS Stream $releasever - Hyperscale Spin - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-spin/
+gpgcheck=0
+priority=50
+enabled=0
diff --git a/distros/centos-stream.conf b/distros/centos-stream.conf
index 155e9d8..408f022 100644
--- a/distros/centos-stream.conf
+++ b/distros/centos-stream.conf
@@ -10,290 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-[baseos]
-name=CentOS Stream $releasever - BaseOS
-metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=1
-
-[baseos-debug]
-name=CentOS Stream $releasever - BaseOS - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[baseos-source]
-name=CentOS Stream $releasever - BaseOS - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[appstream]
-name=CentOS Stream $releasever - AppStream
-metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=1
-
-[appstream-debug]
-name=CentOS Stream $releasever - AppStream - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[appstream-source]
-name=CentOS Stream $releasever - AppStream - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[crb]
-name=CentOS Stream $releasever - CRB
-metalink=https://mirrors.centos.org/metalink?repo=centos-crb-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=1
-
-[crb-debug]
-name=CentOS Stream $releasever - CRB - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-crb-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[crb-source]
-name=CentOS Stream $releasever - CRB - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-crb-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[highavailability]
-name=CentOS Stream $releasever - HighAvailability
-metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=0
-
-[highavailability-debug]
-name=CentOS Stream $releasever - HighAvailability - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[highavailability-source]
-name=CentOS Stream $releasever - HighAvailability - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[nfv]
-name=CentOS Stream $releasever - NFV
-metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=0
-
-[nfv-debug]
-name=CentOS Stream $releasever - NFV - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[nfv-source]
-name=CentOS Stream $releasever - NFV - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[rt]
-name=CentOS Stream $releasever - RT
-metalink=https://mirrors.centos.org/metalink?repo=centos-rt-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=0
-
-[rt-debug]
-name=CentOS Stream $releasever - RT - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-rt-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[rt-source]
-name=CentOS Stream $releasever - RT - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-rt-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[resilientstorage]
-name=CentOS Stream $releasever - ResilientStorage
-metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-countme=1
-enabled=0
-
-[resilientstorage-debug]
-name=CentOS Stream $releasever - ResilientStorage - Debug
-metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-debug-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[resilientstorage-source]
-name=CentOS Stream $releasever - ResilientStorage - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-source-$releasever-stream&arch=source
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-repo_gpgcheck=0
-enabled=0
-
-[epel]
-name=Extra Packages for Enterprise Linux $releasever - $basearch
-metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
-gpgcheck=1
-skip_if_unavailable=False
-
-[epel-next]
-name=Extra Packages for Enterprise Linux $releasever - Next - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
-gpgcheck=1
-skip_if_unavailable=False
-
-# SIG repos
-## Hyperscale
-[centos-hyperscale]
-name=CentOS Stream $releasever - Hyperscale
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-main-$releasever-stream&arch=$basearch&protocol=https,http
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-experimental]
-name=CentOS Stream $releasever - Hyperscale Experimental
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-experimental-$releasever-stream&arch=$basearch&protocol=https,http
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-# These contain packages meant for Facebook use; might not be suitable for general use
-[centos-hyperscale-facebook]
-name=CentOS Stream $releasever - Hyperscale Facebook
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-facebook-$releasever-stream&arch=$basearch&protocol=https,http
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-spin]
-name=CentOS Stream $releasever - Hyperscale Spin
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-spin-$releasever-stream&arch=$basearch&protocol=https,http
-gpgcheck=1
-enabled=0
-priority=50
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-## Hyperscale source repos
-[centos-hyperscale-source]
-name=CentOS Stream $releasever - Hyperscale - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-main-source-$releasever-stream&arch=source&protocol=https,http
-#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-main/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-experimental-source]
-name=CentOS Stream $releasever - Hyperscale Experimental - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-experimental-source-$releasever-stream&arch=source&protocol=https,http
-#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-experimental/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-# These contain packages meant for Facebook use; might not be suitable for general use
-[centos-hyperscale-facebook-source]
-name=CentOS Stream $releasever - Hyperscale Facebook - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-facebook-source-$releasever-stream&arch=source&protocol=https,http
-#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-facebook/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-[centos-hyperscale-spin-source]
-name=CentOS Stream $releasever - Hyperscale Spin - Source
-metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-spin-source-$releasever-stream&arch=source&protocol=https,http
-#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-spin/
-gpgcheck=1
-enabled=0
-priority=50
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
-
-## Hyperscale test repos
-[centos-hyperscale-testing]
-name=CentOS Stream $releasever - Hyperscale - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-main/
-gpgcheck=0
-priority=50
-enabled=0
-
-[centos-hyperscale-experimental-testing]
-name=CentOS Stream $releasever - Hyperscale Experimental - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-experimental/
-gpgcheck=0
-priority=50
-enabled=0
-
-# These contain packages meant for Facebook use; might not be suitable for general use
-[centos-hyperscale-facebook-testing]
-name=CentOS Stream $releasever - Hyperscale Facebook - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-facebook/
-gpgcheck=0
-priority=50
-enabled=0
-
-[centos-hyperscale-spin-testing]
-name=CentOS Stream $releasever - Hyperscale Spin - Testing
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-spin/
-gpgcheck=0
-priority=50
-enabled=0
-
diff --git a/distros/centos-stream/centos-stream.repo b/distros/centos-stream/centos-stream.repo
new file mode 100644
index 0000000..d81b5e3
--- /dev/null
+++ b/distros/centos-stream/centos-stream.repo
@@ -0,0 +1,174 @@
+[baseos]
+name=CentOS Stream $releasever - BaseOS
+metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=1
+
+[baseos-debug]
+name=CentOS Stream $releasever - BaseOS - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[baseos-source]
+name=CentOS Stream $releasever - BaseOS - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[appstream]
+name=CentOS Stream $releasever - AppStream
+metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=1
+
+[appstream-debug]
+name=CentOS Stream $releasever - AppStream - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[appstream-source]
+name=CentOS Stream $releasever - AppStream - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[crb]
+name=CentOS Stream $releasever - CRB
+metalink=https://mirrors.centos.org/metalink?repo=centos-crb-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=1
+
+[crb-debug]
+name=CentOS Stream $releasever - CRB - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-crb-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[crb-source]
+name=CentOS Stream $releasever - CRB - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-crb-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[highavailability]
+name=CentOS Stream $releasever - HighAvailability
+metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=0
+
+[highavailability-debug]
+name=CentOS Stream $releasever - HighAvailability - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[highavailability-source]
+name=CentOS Stream $releasever - HighAvailability - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[nfv]
+name=CentOS Stream $releasever - NFV
+metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=0
+
+[nfv-debug]
+name=CentOS Stream $releasever - NFV - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[nfv-source]
+name=CentOS Stream $releasever - NFV - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[rt]
+name=CentOS Stream $releasever - RT
+metalink=https://mirrors.centos.org/metalink?repo=centos-rt-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=0
+
+[rt-debug]
+name=CentOS Stream $releasever - RT - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-rt-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[rt-source]
+name=CentOS Stream $releasever - RT - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-rt-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[resilientstorage]
+name=CentOS Stream $releasever - ResilientStorage
+metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+countme=1
+enabled=0
+
+[resilientstorage-debug]
+name=CentOS Stream $releasever - ResilientStorage - Debug
+metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-debug-$releasever-stream&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
+
+[resilientstorage-source]
+name=CentOS Stream $releasever - ResilientStorage - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-source-$releasever-stream&arch=source
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+repo_gpgcheck=0
+enabled=0
diff --git a/distros/centos-stream/epel.repo b/distros/centos-stream/epel.repo
new file mode 100644
index 0000000..e5b44a5
--- /dev/null
+++ b/distros/centos-stream/epel.repo
@@ -0,0 +1,13 @@
+[epel]
+name=Extra Packages for Enterprise Linux $releasever - $basearch
+metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+gpgcheck=1
+skip_if_unavailable=False
+
+[epel-next]
+name=Extra Packages for Enterprise Linux $releasever - Next - $basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+gpgcheck=1
+skip_if_unavailable=False
diff --git a/distros/centos-stream/hyperscale.repo b/distros/centos-stream/hyperscale.repo
new file mode 100644
index 0000000..b1530f5
--- /dev/null
+++ b/distros/centos-stream/hyperscale.repo
@@ -0,0 +1,95 @@
+[centos-hyperscale]
+name=CentOS Stream $releasever - Hyperscale
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-main-$releasever-stream&arch=$basearch&protocol=https,http
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-experimental]
+name=CentOS Stream $releasever - Hyperscale Experimental
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-experimental-$releasever-stream&arch=$basearch&protocol=https,http
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+# These contain packages meant for Facebook use; might not be suitable for general use
+[centos-hyperscale-facebook]
+name=CentOS Stream $releasever - Hyperscale Facebook
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-facebook-$releasever-stream&arch=$basearch&protocol=https,http
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-spin]
+name=CentOS Stream $releasever - Hyperscale Spin
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-spin-$releasever-stream&arch=$basearch&protocol=https,http
+gpgcheck=1
+enabled=0
+priority=50
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+## Hyperscale source repos
+[centos-hyperscale-source]
+name=CentOS Stream $releasever - Hyperscale - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-main-source-$releasever-stream&arch=source&protocol=https,http
+#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-main/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-experimental-source]
+name=CentOS Stream $releasever - Hyperscale Experimental - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-experimental-source-$releasever-stream&arch=source&protocol=https,http
+#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-experimental/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+# These contain packages meant for Facebook use; might not be suitable for general use
+[centos-hyperscale-facebook-source]
+name=CentOS Stream $releasever - Hyperscale Facebook - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-facebook-source-$releasever-stream&arch=source&protocol=https,http
+#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-facebook/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+[centos-hyperscale-spin-source]
+name=CentOS Stream $releasever - Hyperscale Spin - Source
+metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-spin-source-$releasever-stream&arch=source&protocol=https,http
+#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/hyperscale/source/packages-spin/
+gpgcheck=1
+enabled=0
+priority=50
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-HyperScale
+
+## Hyperscale test repos
+[centos-hyperscale-testing]
+name=CentOS Stream $releasever - Hyperscale - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-main/
+gpgcheck=0
+priority=50
+enabled=0
+
+[centos-hyperscale-experimental-testing]
+name=CentOS Stream $releasever - Hyperscale Experimental - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-experimental/
+gpgcheck=0
+priority=50
+enabled=0
+
+# These contain packages meant for Facebook use; might not be suitable for general use
+[centos-hyperscale-facebook-testing]
+name=CentOS Stream $releasever - Hyperscale Facebook - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-facebook/
+gpgcheck=0
+priority=50
+enabled=0
+
+[centos-hyperscale-spin-testing]
+name=CentOS Stream $releasever - Hyperscale Spin - Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever-stream/hyperscale/$basearch/packages-spin/
+gpgcheck=0
+priority=50
+enabled=0
+
diff --git a/distros/centos.conf b/distros/centos.conf
index c8ba6a8..408f022 100644
--- a/distros/centos.conf
+++ b/distros/centos.conf
@@ -10,47 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-[BaseOS]
-name=CentOS-$releasever - Base
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=stock
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-skip_if_unavailable=False
-
-[AppStream]
-name=CentOS-$releasever - AppStream
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=stock
-#baseurl=http://mirror.centos.org/centos/$releasever/AppStream/$basearch/os/
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[PowerTools]
-name=CentOS-$releasever - PowerTools
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=stock
-#baseurl=http://mirror.centos.org/centos/$releasever/PowerTools/$basearch/os/
-gpgcheck=1
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[centosplus]
-name=CentOS-$releasever - Plus
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=stock
-#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/os/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[cr]
-name=CentOS-$releasever - cr
-baseurl=http://mirror.centos.org/centos/8/cr/$basearch/os/
-gpgcheck=1
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-
-[epel]
-name=epel
-metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
-gpgcheck=1
-skip_if_unavailable=False
-
diff --git a/distros/centos/centos.repo b/distros/centos/centos.repo
new file mode 100644
index 0000000..8328e4d
--- /dev/null
+++ b/distros/centos/centos.repo
@@ -0,0 +1,35 @@
+[BaseOS]
+name=CentOS-$releasever - Base
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=stock
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+skip_if_unavailable=False
+
+[AppStream]
+name=CentOS-$releasever - AppStream
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=stock
+#baseurl=http://mirror.centos.org/centos/$releasever/AppStream/$basearch/os/
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+
+[PowerTools]
+name=CentOS-$releasever - PowerTools
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=stock
+#baseurl=http://mirror.centos.org/centos/$releasever/PowerTools/$basearch/os/
+gpgcheck=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+
+[centosplus]
+name=CentOS-$releasever - Plus
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=stock
+#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
+
+[cr]
+name=CentOS-$releasever - cr
+baseurl=http://mirror.centos.org/centos/8/cr/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
diff --git a/distros/centos/epel.repo b/distros/centos/epel.repo
new file mode 100644
index 0000000..a2bad24
--- /dev/null
+++ b/distros/centos/epel.repo
@@ -0,0 +1,7 @@
+[epel]
+name=epel
+metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
+gpgcheck=1
+skip_if_unavailable=False
+
diff --git a/distros/fedora.conf b/distros/fedora.conf
index 278b968..408f022 100644
--- a/distros/fedora.conf
+++ b/distros/fedora.conf
@@ -10,30 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[fedora]
-name=Fedora $releasever - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-gpgcheck=1
-
-[fedora-source]
-name=Fedora $releasever - Source
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-gpgcheck=1
-
-[updates]
-name=Fedora $releasever - $basearch - Updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-gpgcheck=1
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-gpgcheck=1
diff --git a/distros/fedora/fedora.repo b/distros/fedora/fedora.repo
new file mode 100644
index 0000000..d9b1540
--- /dev/null
+++ b/distros/fedora/fedora.repo
@@ -0,0 +1,25 @@
+[fedora]
+name=Fedora $releasever - $basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
+gpgcheck=1
+
+[fedora-source]
+name=Fedora $releasever - Source
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
+gpgcheck=1
+
+[updates]
+name=Fedora $releasever - $basearch - Updates
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
+gpgcheck=1
+
+[updates-source]
+name=Fedora $releasever - Updates Source
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
+gpgcheck=1
diff --git a/distros/mageia.conf b/distros/mageia.conf
index 9d51521..408f022 100644
--- a/distros/mageia.conf
+++ b/distros/mageia.conf
@@ -10,16 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[mageia]
-name=mageia
-mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch=$distarch&section=core&repo=release
-gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia
-gpgcheck=1
-
-[updates]
-name=updates
-mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch=$distarch&section=core&repo=updates
-gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia
-gpgcheck=1
diff --git a/distros/mageia/mageia.repo b/distros/mageia/mageia.repo
new file mode 100644
index 0000000..4f05138
--- /dev/null
+++ b/distros/mageia/mageia.repo
@@ -0,0 +1,11 @@
+[mageia]
+name=mageia
+mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch=$distarch&section=core&repo=release
+gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia
+gpgcheck=1
+
+[updates]
+name=updates
+mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch=$distarch&section=core&repo=updates
+gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia
+gpgcheck=1
diff --git a/distros/opensuse-leap-legacy.conf b/distros/opensuse-leap-legacy.conf
index 134058c..408f022 100644
--- a/distros/opensuse-leap-legacy.conf
+++ b/distros/opensuse-leap-legacy.conf
@@ -10,18 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[opensuse-leap-oss]
-name=opensuse-leap-oss
-metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/suse/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
-
-[updates-oss]
-name=updates-oss
-metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
diff --git a/distros/opensuse-leap-legacy/opensuse-leap-legacy.repo b/distros/opensuse-leap-legacy/opensuse-leap-legacy.repo
new file mode 100644
index 0000000..a9db19c
--- /dev/null
+++ b/distros/opensuse-leap-legacy/opensuse-leap-legacy.repo
@@ -0,0 +1,13 @@
+[opensuse-leap-oss]
+name=opensuse-leap-oss
+metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/suse/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
+
+[updates-oss]
+name=updates-oss
+metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
diff --git a/distros/opensuse-leap.conf b/distros/opensuse-leap.conf
index 03e93e6..408f022 100644
--- a/distros/opensuse-leap.conf
+++ b/distros/opensuse-leap.conf
@@ -10,32 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[opensuse-leap-oss]
-name=openSUSE Leap $releasever - OSS
-metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-        file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
-        file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15
-gpgcheck=1
-repo_gpgcheck=1
-
-[opensuse-leap-oss-update]
-name=openSUSE Leap $releasever - OSS - Updates
-metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
-
-[opensuse-leap-sle-update]
-name=openSUSE Leap $releasever - Updates from SUSE Linux Enterprise
-metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-SuSE-SLE-15
-gpgcheck=1
-
-[opensuse-leap-sle-backports-update]
-name=openSUSE Leap $releasever - Updates from Backports for SUSE Linux Enterprise
-metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
-gpgcheck=1
diff --git a/distros/opensuse-leap/opensuse-leap.repo b/distros/opensuse-leap/opensuse-leap.repo
new file mode 100644
index 0000000..ef2eb2e
--- /dev/null
+++ b/distros/opensuse-leap/opensuse-leap.repo
@@ -0,0 +1,27 @@
+[opensuse-leap-oss]
+name=openSUSE Leap $releasever - OSS
+metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+        file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
+        file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15
+gpgcheck=1
+repo_gpgcheck=1
+
+[opensuse-leap-oss-update]
+name=openSUSE Leap $releasever - OSS - Updates
+metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
+
+[opensuse-leap-sle-update]
+name=openSUSE Leap $releasever - Updates from SUSE Linux Enterprise
+metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-SuSE-SLE-15
+gpgcheck=1
+
+[opensuse-leap-sle-backports-update]
+name=openSUSE Leap $releasever - Updates from Backports for SUSE Linux Enterprise
+metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
+gpgcheck=1
diff --git a/distros/opensuse-leap15-legacy.conf b/distros/opensuse-leap15-legacy.conf
index be86c28..408f022 100644
--- a/distros/opensuse-leap15-legacy.conf
+++ b/distros/opensuse-leap15-legacy.conf
@@ -10,18 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[opensuse-leap-oss]
-name=opensuse-leap-oss
-metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
-
-[updates-oss]
-name=updates-oss
-metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
diff --git a/distros/opensuse-leap15-legacy/opensuse-leap15-legacy.repo b/distros/opensuse-leap15-legacy/opensuse-leap15-legacy.repo
new file mode 100644
index 0000000..7044899
--- /dev/null
+++ b/distros/opensuse-leap15-legacy/opensuse-leap15-legacy.repo
@@ -0,0 +1,13 @@
+[opensuse-leap-oss]
+name=opensuse-leap-oss
+metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
+
+[updates-oss]
+name=updates-oss
+metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
diff --git a/distros/opensuse-tumbleweed-snapshot.conf b/distros/opensuse-tumbleweed-snapshot.conf
index 37c5fee..408f022 100644
--- a/distros/opensuse-tumbleweed-snapshot.conf
+++ b/distros/opensuse-tumbleweed-snapshot.conf
@@ -10,11 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[opensuse-tumbleweed-oss]
-name=opensuse-tumbleweed-oss
-metalink=https://download.opensuse.org/history/$releasever/tumbleweed/repo/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
diff --git a/distros/opensuse-tumbleweed-snapshot/opensuse-tumbleweed-snapshot.repo b/distros/opensuse-tumbleweed-snapshot/opensuse-tumbleweed-snapshot.repo
new file mode 100644
index 0000000..3c4edc4
--- /dev/null
+++ b/distros/opensuse-tumbleweed-snapshot/opensuse-tumbleweed-snapshot.repo
@@ -0,0 +1,6 @@
+[opensuse-tumbleweed-oss]
+name=opensuse-tumbleweed-oss
+metalink=https://download.opensuse.org/history/$releasever/tumbleweed/repo/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
diff --git a/distros/opensuse-tumbleweed.conf b/distros/opensuse-tumbleweed.conf
index 0ce4927..408f022 100644
--- a/distros/opensuse-tumbleweed.conf
+++ b/distros/opensuse-tumbleweed.conf
@@ -10,11 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[opensuse-tumbleweed-oss]
-name=opensuse-tumbleweed-oss
-metalink=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink
-gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
-gpgcheck=1
-repo_gpgcheck=1
diff --git a/distros/opensuse-tumbleweed/opensuse-tumbleweed.repo b/distros/opensuse-tumbleweed/opensuse-tumbleweed.repo
new file mode 100644
index 0000000..8ba8cd8
--- /dev/null
+++ b/distros/opensuse-tumbleweed/opensuse-tumbleweed.repo
@@ -0,0 +1,6 @@
+[opensuse-tumbleweed-oss]
+name=opensuse-tumbleweed-oss
+metalink=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink
+gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
+gpgcheck=1
+repo_gpgcheck=1
diff --git a/distros/rhel-ubi.conf b/distros/rhel-ubi.conf
index d804408..408f022 100644
--- a/distros/rhel-ubi.conf
+++ b/distros/rhel-ubi.conf
@@ -10,63 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-[ubi-baseos]
-name=Red Hat Universal Base Image $releasever (RPMs) - BaseOS
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/os
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-baseos-debug]
-name=Red Hat Universal Base Image $releasever (Debug RPMs) - BaseOS
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/debug
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-baseos-source]
-name=Red Hat Universal Base Image $releasever (Source RPMs) - BaseOS
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/source/SRPMS
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-appstream]
-name=Red Hat Universal Base Image $releasever (RPMs) - AppStream
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/os
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-appstream-debug]
-name=Red Hat Universal Base Image $releasever (Debug RPMs) - AppStream
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/debug
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-appstream-source]
-name=Red Hat Universal Base Image $releasever (Source RPMs) - AppStream
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/source/SRPMS
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-codeready-builder]
-name=Red Hat Universal Base Image $releasever (RPMs) - CodeReady Builder
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/os
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-codeready-builder-debug]
-name=Red Hat Universal Base Image $releasever (Debug RPMs) - CodeReady Builder
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/debug
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
-
-[ubi-codeready-builder-source]
-name=Red Hat Universal Base Image $releasever (Source RPMs) - CodeReady Builder
-baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/source/SRPMS
-enabled=0
-gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
-gpgcheck=1
diff --git a/distros/rhel-ubi/rhel-ubi.repo b/distros/rhel-ubi/rhel-ubi.repo
new file mode 100644
index 0000000..6558caf
--- /dev/null
+++ b/distros/rhel-ubi/rhel-ubi.repo
@@ -0,0 +1,59 @@
+[ubi-baseos]
+name=Red Hat Universal Base Image $releasever (RPMs) - BaseOS
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/os
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-baseos-debug]
+name=Red Hat Universal Base Image $releasever (Debug RPMs) - BaseOS
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/debug
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-baseos-source]
+name=Red Hat Universal Base Image $releasever (Source RPMs) - BaseOS
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/source/SRPMS
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-appstream]
+name=Red Hat Universal Base Image $releasever (RPMs) - AppStream
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/os
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-appstream-debug]
+name=Red Hat Universal Base Image $releasever (Debug RPMs) - AppStream
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/debug
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-appstream-source]
+name=Red Hat Universal Base Image $releasever (Source RPMs) - AppStream
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/source/SRPMS
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-codeready-builder]
+name=Red Hat Universal Base Image $releasever (RPMs) - CodeReady Builder
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/os
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-codeready-builder-debug]
+name=Red Hat Universal Base Image $releasever (Debug RPMs) - CodeReady Builder
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/debug
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
+
+[ubi-codeready-builder-source]
+name=Red Hat Universal Base Image $releasever (Source RPMs) - CodeReady Builder
+baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/source/SRPMS
+enabled=0
+gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
+gpgcheck=1
diff --git a/distros/sle-bci.conf b/distros/sle-bci.conf
index bf66853..408f022 100644
--- a/distros/sle-bci.conf
+++ b/distros/sle-bci.conf
@@ -10,10 +10,3 @@ best=1
 install_weak_deps=0
 metadata_expire=6h
 mdpolicy=group:primary
-
-# repos
-[SLE_BCI]
-name=SUSE Linux Enterprise $releasever - Base Container Image
-baseurl=https://updates.suse.com/SUSE/Products/SLE-BCI/$releaseversp/$basearch/product/
-gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-$releasever
-gpgcheck=1
diff --git a/distros/sle-bci/sle-bci.repo b/distros/sle-bci/sle-bci.repo
new file mode 100644
index 0000000..1263d99
--- /dev/null
+++ b/distros/sle-bci/sle-bci.repo
@@ -0,0 +1,5 @@
+[SLE_BCI]
+name=SUSE Linux Enterprise $releasever - Base Container Image
+baseurl=https://updates.suse.com/SUSE/Products/SLE-BCI/$releaseversp/$basearch/product/
+gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-$releasever
+gpgcheck=1
diff --git a/rpmdistro-gendnfconf b/rpmdistro-gendnfconf
deleted file mode 100755
index 4ffe37d..0000000
--- a/rpmdistro-gendnfconf
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-
-# Script to generate repository configuration for rpmdistro-repoquery
-# Author: Neal Gompa
-# License: MIT
-# See LICENSE for license information
-
-import argparse
-import datetime
-import os
-import shutil
-import subprocess
-import sys
-import tempfile
-
-import rpm
-
-
-def generate_dnf_config(distro, releasever, output_filepath):
-    with open("./distros/{0}.conf".format(distro)) as dnfconf_file:
-        dnf_conf = dnfconf_file.read()
-        releasever_tuple = tuple(releasever.split(".", 1))
-        if distro == "sle-bci" and len(releasever_tuple) > 1:
-            releaseversp = "{}-SP{}".format(releasever_tuple[0], releasever_tuple[1])
-        else:
-            releaseversp = "{}".format(releasever_tuple[0])
-        # Mageia needs proper arch setup for repos
-        if distro == "mageia":
-            dnf_conf = dnf_conf.replace("$distarch", rpm.expandMacro("%{_target_cpu}"))
-        if distro == "sle-bci":
-            dnf_conf = dnf_conf.replace("$releaseversp", releaseversp)
-        with open(output_filepath, 'w') as gen_dnfconf_file:
-            gen_dnfconf_file.write(dnf_conf)
-            gen_dnfconf_file.flush()
-    return
-
-
-parser = argparse.ArgumentParser(description="Creates dnf.conf for rpmdistro-repoquery")
-
-parser.add_argument("-d", "--distro", help="Distribution base to use", dest="distro", choices=["fedora", "mageia", "opensuse-leap", "opensuse-tumbleweed", "centos", "centos-stream", "rhel-ubi", "sle-bci"], required=True)
-parser.add_argument("-r", "--releasever", help="Distribution release version", dest="releasever", required=True)
-parser.add_argument("-o", "--output-conf-file", help="File path to write DNF config file", dest="outputpath", required=True)
-
-args = parser.parse_args()
-
-# Check to ensure we're *not* running as root
-if os.geteuid() == 0:
-    sys.exit("This script must never be run as root!")
-
-# Make the config file
-dnf_config = generate_dnf_config(args.distro, args.releasever, args.outputpath)
diff --git a/rpmdistro-repoquery b/rpmdistro-repoquery
index 5797d4b..850bb7c 100755
--- a/rpmdistro-repoquery
+++ b/rpmdistro-repoquery
@@ -8,9 +8,25 @@
 config=$1
 releasever=$2
 module_platform=""
+reposdir=${config%%.*}
 
 if [[ "$1" =~ "centos" ]]; then
 	module_platform="--setopt=module_platform_id=platform:el${2}"
 fi
 
-dnf --config=${config} --releasever=${releasever} ${module_platform} --nogpgcheck repoquery "${@:3}"
+if [[ "$1" =~ "mageia" ]]; then
+	DNF_VAR_distarch=$(rpm --eval "%{_target_cpu}")
+	export DNF_VAR_distarch
+fi
+
+if [[ "$1" =~ "sle-bci" ]]; then
+	arr=(${releasever//./ })
+	if [ "${#arr[@]}" -gt "1" ]; then
+		DNF_VAR_releaseversp="${arr[0]}-SP${arr[1]}"
+	else
+		DNF_VAR_releaseversp="${arr[0]}"
+	fi
+	export DNF_VAR_releaseversp
+fi
+
+dnf --config=${config} --setopt=reposdir=${reposdir} --releasever=${releasever} ${module_platform} --nogpgcheck repoquery "${@:3}"