diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos
index 21a91eb2..69f56309 100644
--- a/ansible/inventory/group_vars/all/package-repos
+++ b/ansible/inventory/group_vars/all/package-repos
@@ -161,182 +161,6 @@ deb_package_repos_filtered: "{{ deb_package_repos | select_repos(deb_package_rep
 # sync: Whether to sync the repository with a remote. Optional, default is true.
 # publish: Whether to publish and distribute the repository. Optional, default is true.
 rpm_package_repos:
-  # Base CentOS 8 Stream repositories
-  - name: CentOS Stream 8 - AppStream
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=AppStream&infra=genclo
-    base_path: centos/8-stream/AppStream/x86_64/os/
-    short_name: centos_stream_8_appstream
-    sync_group: centos
-    distribution_name: centos-stream-8-appstream-
-    sync: false
-  - name: CentOS Stream 8 - BaseOS
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=BaseOS&infra=genclo
-    base_path: centos/8-stream/BaseOS/x86_64/os/
-    short_name: centos_stream_8_baseos
-    sync_group: centos
-    distribution_name: centos-stream-8-baseos-
-    sync: false
-  - name: CentOS Stream 8 - Extras
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=extras&infra=genclo
-    base_path: centos/8-stream/extras/x86_64/os/
-    short_name: centos_stream_8_extras
-    sync_group: centos
-    distribution_name: centos-stream-8-extras-
-    sync: false
-  - name: CentOS Stream 8 - Extras common packages
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=extras-extras-common&infra=genclo
-    base_path: centos/8-stream/extras/x86_64/extras-common/
-    short_name: centos_stream_8_extras_common
-    sync_group: centos
-    distribution_name: centos-stream-8-extras-common-
-    sync: false
-
-  # Additional CentOS 8 Stream repositories
-  - name: CentOS Stream 8 - Advanced Virtualization
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=virt-advancedvirt-common
-    base_path: centos/8-stream/virt/x86_64/advancedvirt-common/
-    short_name: centos_stream_8_advanced_virtualization
-    sync_group: centos
-    distribution_name: centos-stream-8-advancedvirt-
-    sync: false
-  - name: CentOS Stream 8 - Ceph Nautilus
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=storage-ceph-nautilus
-    base_path: centos/8-stream/storage/x86_64/ceph-nautilus/
-    short_name: centos_stream_8_storage_ceph_nautilus
-    sync_group: centos
-    distribution_name: centos-stream-8-storage-ceph-nautilus-
-    sync: false
-  - name: CentOS Stream 8 - Ceph Pacific
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=storage-ceph-pacific
-    base_path: centos/8-stream/storage/x86_64/ceph-pacific/
-    short_name: centos_stream_8_storage_ceph_pacific
-    sync_group: centos
-    distribution_name: centos-stream-8-storage-ceph-pacific-
-    sync: false
-  - name: CentOS Stream 8 - Ceph Quincy
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=storage-ceph-quincy
-    base_path: centos/8-stream/storage/x86_64/ceph-quincy/
-    short_name: centos_stream_8_storage_ceph_quincy
-    sync_group: centos
-    distribution_name: centos-stream-8-storage-ceph-quincy-
-    sync: false
-  - name: CentOS Stream 8 - NFV Extras
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=nfv-network-extras
-    base_path: centos/8-stream/nfv/x86_64/network-extras/
-    short_name: centos_stream_8_nfv_extras
-    sync_group: centos
-    distribution_name: centos-stream-8-nfv-extras-
-    sync: false
-  - name: CentOS Stream 8 - NFV OpenvSwitch
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=nfv-openvswitch-2
-    base_path: centos/8-stream/nfv/x86_64/openvswitch-2/
-    short_name: centos_stream_8_nfv_openvswitch
-    sync_group: centos
-    distribution_name: centos-stream-8-nfv-openvswitch-
-    sync: false
-  - name: CentOS Stream 8 - OpenStack Wallaby
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=cloud-openstack-wallaby
-    base_path: centos/8-stream/cloud/x86_64/openstack-wallaby/
-    short_name: centos_stream_8_openstack_wallaby
-    sync_group: centos
-    distribution_name: centos-stream-8-openstack-wallaby-
-    sync: false
-  - name: CentOS Stream 8 - OpenStack Xena
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=cloud-openstack-xena
-    base_path: centos/8-stream/cloud/x86_64/openstack-xena/
-    short_name: centos_stream_8_openstack_xena
-    sync_group: centos
-    distribution_name: centos-stream-8-openstack-xena-
-    sync: false
-  - name: CentOS Stream 8 - OpenStack Yoga
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=cloud-openstack-yoga
-    base_path: centos/8-stream/cloud/x86_64/openstack-yoga/
-    short_name: centos_stream_8_openstack_yoga
-    sync_group: centos
-    distribution_name: centos-stream-8-openstack-yoga-
-    sync: false
-  - name: CentOS Stream 8 - OpsTools - collectd
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=opstools-collectd-5
-    base_path: centos/8-stream/opstools/x86_64/collectd-5/
-    short_name: centos_stream_8_opstools
-    sync_group: centos
-    distribution_name: centos-stream-8-opstools-
-    sync: false
-  - name: CentOS Stream 8 - PowerTools
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=PowerTools&infra=genclo
-    base_path: centos/8-stream/PowerTools/x86_64/os/
-    short_name: centos_stream_8_powertools
-    sync_group: centos
-    distribution_name: centos-stream-8-powertools-
-    sync: false
-  - name: CentOS Stream 8 - HighAvailability
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=HighAvailability&infra=genclo
-    base_path: centos/8-stream/HighAvailability/x86_64/os/
-    short_name: centos_stream_8_highavailability
-    sync_group: centos
-    distribution_name: centos-stream-8-highavailability-
-    sync: false
-  - name: CentOS Stream 8 - Kmods Main
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=kmods-packages-main&infra=genclo
-    base_path: centos/8-stream/kmods/x86_64/packages-main/
-    short_name: centos_stream_8_kmods_main
-    sync_group: centos
-    distribution_name: centos-stream-8-kmods-main-
-    sync: false
-  - name: CentOS Stream 8 - Kmods Rebuild
-    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=kmods-packages-rebuild&infra=genclo
-    base_path: centos/8-stream/kmods/x86_64/packages-rebuild/
-    short_name: centos_stream_8_kmods_rebuild
-    sync_group: centos
-    distribution_name: centos-stream-8-kmods-rebuild-
-    sync: false
-
-  # Base CentOS 8 Linux repositories
-  - name: CentOS Linux 8 - AppStream
-    sync: false
-    publish: false
-  - name: CentOS Linux 8 - BaseOS
-    sync: false
-    publish: false
-  - name: CentOS Linux 8 - Extras
-    sync: false
-    publish: false
-
-  # Additional CentOS 8 Linux repositories (used by Stream builds)
-  - name: CentOS 8 - Ceph Nautilus
-    base_path: centos/8/storage/x86_64/ceph-nautilus/
-    short_name: centos_8_storage_ceph_nautilus
-    sync_group: centos
-    distribution_name: centos-8-storage-ceph-nautilus-
-    sync: false
-  - name: CentOS 8 - Ceph Octopus
-    distribution_name: centos-8-storage-ceph-octopus-
-    sync: false
-    publish: false
-  - name: CentOS 8 - OpsTools - collectd
-    base_path: centos/8/opstools/x86_64/collectd-5/
-    short_name: centos_8_opstools
-    sync_group: centos
-    distribution_name: centos-8-opstools-
-    sync: false
-
-  # Additional CentOS 8 Linux repositories (not used by Stream builds)
-  - name: CentOS-8 - Advanced Virtualization
-    sync: false
-    publish: false
-  - name: CentOS-8 - NFV OpenvSwitch
-    sync: false
-    publish: false
-  - name: CentOS-8 - OpenStack Ussuri
-    sync: false
-    publish: false
-  - name: CentOS-8 - OpenStack Victoria
-    sync: false
-    publish: false
-  - name: CentOS Linux 8 - PowerTools
-    sync: false
-    publish: false
-
   # EPEL 8 repositories
   - name: Extra Packages for Enterprise Linux 8 - x86_64
     url: https://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64&country=NL&infra=stock&content=centos&protocol=https
@@ -416,325 +240,6 @@ rpm_package_repos:
     sync_group: third_party
     distribution_name: treasuredata-4-
 
-  # Base Rocky Linux 8.5 repositories
-  - name: Rocky Linux 8.5 - AppStream
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.5&arch=x86_64&country=NL
-    base_path: rocky/8.5/AppStream/x86_64/os/
-    short_name: rocky_8_5_appstream
-    sync_group: rocky_8
-    distribution_name: rocky-8.5-appstream-
-    sync: false
-  - name: Rocky Linux 8.5 - BaseOS
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.5&arch=x86_64&country=NL
-    base_path: rocky/8.5/BaseOS/x86_64/os/
-    short_name: rocky_8_5_baseos
-    sync_group: rocky_8
-    distribution_name: rocky-8.5-baseos-
-    sync: false
-  - name: Rocky Linux 8.5 - Extras
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.5&arch=x86_64&country=NL
-    base_path: rocky/8.5/extras/x86_64/os/
-    short_name: rocky_8_5_extras
-    sync_group: rocky_8
-    distribution_name: rocky-8.5-extras-
-    sync: false
-
-  # Additional Rocky Linux 8.5 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux NFV 8.5
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-nfv-8.5&arch=x86_64&country=NL
-    base_path: rocky/8.5/nfv/x86_64/os/
-    short_name: rocky_8_5_nfv
-    sync_group: rocky_8
-    distribution_name: rocky-8.5-nfv-
-    sync: false
-  - name: Rocky Linux 8.5 - PowerTools
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.5&arch=x86_64&country=NL
-    base_path: rocky/8.5/PowerTools/x86_64/os/
-    short_name: rocky_8_5_powertools
-    sync_group: rocky_8
-    distribution_name: rocky-8.5-powertools-
-    sync: false
-
-  # Base Rocky Linux 8.6 repositories
-  - name: Rocky Linux 8.6 - AppStream
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.6&arch=x86_64&country=NL
-    base_path: rocky/8.6/AppStream/x86_64/os/
-    short_name: rocky_8_6_appstream
-    sync_group: rocky_8
-    distribution_name: rocky-8.6-appstream-
-    sync: false
-  - name: Rocky Linux 8.6 - BaseOS
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.6&arch=x86_64&country=NL
-    base_path: rocky/8.6/BaseOS/x86_64/os/
-    short_name: rocky_8_6_baseos
-    sync_group: rocky_8
-    distribution_name: rocky-8.6-baseos-
-    sync: false
-  - name: Rocky Linux 8.6 - Extras
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.6&arch=x86_64&country=NL
-    base_path: rocky/8.6/extras/x86_64/os/
-    short_name: rocky_8_6_extras
-    sync_group: rocky_8
-    distribution_name: rocky-8.6-extras-
-    sync: false
-
-  # Additional Rocky Linux 8.6 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux NFV 8.6
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-NFV-8.6&arch=x86_64&country=NL
-    base_path: rocky/8.6/nfv/x86_64/os/
-    short_name: rocky_8_6_nfv
-    sync_group: rocky_8
-    distribution_name: rocky-8.6-nfv-
-    sync: false
-  - name: Rocky Linux 8.6 - PowerTools
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.6&arch=x86_64&country=NL
-    base_path: rocky/8.6/PowerTools/x86_64/os/
-    short_name: rocky_8_6_powertools
-    sync_group: rocky_8
-    distribution_name: rocky-8.6-powertools-
-    sync: false
-  - name: Rocky Linux 8.6 - HighAvailability
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-8.6&arch=x86_64&country=NL
-    base_path: rocky/8.6/HighAvailability/x86_64/os/
-    short_name: rocky_8_6_highavailability
-    sync_group: rocky_8
-    distribution_name: rocky-8.6-highavailability-
-    sync: false
-
-  # Base Rocky Linux 8.7 repositories
-  - name: Rocky Linux 8.7 - AppStream
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.7&arch=x86_64&country=NL
-    base_path: rocky/8.7/AppStream/x86_64/os/
-    short_name: rocky_8_7_appstream
-    sync_group: rocky_8
-    distribution_name: rocky-8.7-appstream-
-    sync: false
-  - name: Rocky Linux 8.7 - BaseOS
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.7&arch=x86_64&country=NL
-    base_path: rocky/8.7/BaseOS/x86_64/os/
-    short_name: rocky_8_7_baseos
-    sync_group: rocky_8
-    distribution_name: rocky-8.7-baseos-
-    sync: false
-  - name: Rocky Linux 8.7 - Extras
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.7&arch=x86_64&country=NL
-    base_path: rocky/8.7/extras/x86_64/os/
-    short_name: rocky_8_7_extras
-    sync_group: rocky_8
-    distribution_name: rocky-8.7-extras-
-    sync: false
-
-  # Additional Rocky Linux 8.7 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux NFV 8.7
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-NFV-8.7&arch=x86_64&country=NL
-    base_path: rocky/8.7/nfv/x86_64/os/
-    short_name: rocky_8_7_nfv
-    sync_group: rocky_8
-    distribution_name: rocky-8.7-nfv-
-    sync: false
-  - name: Rocky Linux 8.7 - PowerTools
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.7&arch=x86_64&country=NL
-    base_path: rocky/8.7/PowerTools/x86_64/os/
-    short_name: rocky_8_7_powertools
-    sync_group: rocky_8
-    distribution_name: rocky-8.7-powertools-
-    sync: false
-  - name: Rocky Linux 8.7 - HighAvailability
-    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-8.7&arch=x86_64&country=NL
-    base_path: rocky/8.7/HighAvailability/x86_64/os/
-    short_name: rocky_8_7_highavailability
-    sync_group: rocky_8
-    distribution_name: rocky-8.7-highavailability-
-    sync: false
-
-  # Base Rocky Linux 8.8 repositories
-  - name: Rocky Linux 8.8 - AppStream
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.8&arch=x86_64&country=NL
-    base_path: rocky/8.8/AppStream/x86_64/os/
-    short_name: rocky_8_8_appstream
-    sync_group: rocky_8
-    distribution_name: rocky-8.8-appstream-
-    sync: false
-  - name: Rocky Linux 8.8 - BaseOS
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.8&arch=x86_64&country=NL
-    base_path: rocky/8.8/BaseOS/x86_64/os/
-    short_name: rocky_8_8_baseos
-    sync_group: rocky_8
-    distribution_name: rocky-8.8-baseos-
-    sync: false
-  - name: Rocky Linux 8.8 - Extras
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-8.8&arch=x86_64&country=NL
-    base_path: rocky/8.8/extras/x86_64/os/
-    short_name: rocky_8_8_extras
-    sync_group: rocky_8
-    distribution_name: rocky-8.8-extras-
-    sync: false
-
-  # Additional Rocky Linux 8.8 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux NFV 8.8
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-NFV-8.8&arch=x86_64&country=NL
-    base_path: rocky/8.8/nfv/x86_64/os/
-    short_name: rocky_8_8_nfv
-    sync_group: rocky_8
-    distribution_name: rocky-8.8-nfv-
-    sync: false
-  - name: Rocky Linux 8.8 - PowerTools
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.8&arch=x86_64&country=NL
-    base_path: rocky/8.8/PowerTools/x86_64/os/
-    short_name: rocky_8_8_powertools
-    sync_group: rocky_8
-    distribution_name: rocky-8.8-powertools-
-    sync: false
-  - name: Rocky Linux 8.8 - HighAvailability
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-8.8&arch=x86_64&country=NL
-    base_path: rocky/8.8/HighAvailability/x86_64/os/
-    short_name: rocky_8_8_highavailability
-    sync_group: rocky_8
-    distribution_name: rocky-8.8-highavailability-
-    sync: false
-
-  # MLNX OFED 5.6-1.0.3.3 RHEL 8.6 repository
-  - name: Mellanox Technologies mlnx_ofed 5.6-1.0.3.3
-    url: https://linux.mellanox.com/public/repo/mlnx_ofed/5.6-1.0.3.3/rhel8.6/x86_64/
-    base_path: mlnx_ofed/5.6-1.0.3.3/rhel8.6/x86_64/
-    short_name: mlnx_ofed_5_6_1_0_3_3_rhel8_6
-    sync_group: third_party
-    distribution_name: mlnx_ofed-5.6-1.0.3.3-rhel8.6-
-    sync: false
-
-  # MLNX OFED 5.7-1.0.2.0 RHEL 8.6 repository
-  - name: Mellanox Technologies mlnx_ofed 5.7-1.0.2.0
-    url: https://linux.mellanox.com/public/repo/mlnx_ofed/5.7-1.0.2.0/rhel8.6/x86_64/
-    base_path: mlnx_ofed/5.7-1.0.2.0/rhel8.6/x86_64/
-    short_name: mlnx_ofed_5_7_1_0_2_0_rhel8_6
-    sync_group: third_party
-    distribution_name: mlnx_ofed-5.7-1.0.2.0-rhel8.6-
-    sync: false
-
-  # Base Rocky Linux 9.1 repositories
-  - name: Rocky Linux 9.1 - AppStream
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.1&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.1/AppStream/x86_64/os/
-    short_name: rocky_9_1_appstream
-    sync_group: rocky_9
-    distribution_name: rocky-9.1-appstream-
-    sync: false
-  - name: Rocky Linux 9.1 - BaseOS
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.1&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.1/BaseOS/x86_64/os/
-    short_name: rocky_9_1_baseos
-    sync_group: rocky_9
-    distribution_name: rocky-9.1-baseos-
-    sync: false
-  - name: Rocky Linux 9.1 - Extras
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.1&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.1/extras/x86_64/os/
-    short_name: rocky_9_1_extras
-    sync_group: rocky_9
-    distribution_name: rocky-9.1-extras-
-    sync: false
-
-  # Additional Rocky Linux 9.1 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux 9.1 - CRB
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.1&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.1/CRB/x86_64/os/
-    short_name: rocky_9_1_crb
-    sync_group: rocky_9
-    distribution_name: rocky-9.1-crb-
-    sync: false
-  - name: Rocky Linux 9.1 - HighAvailability
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.1&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.1/highavailability/x86_64/os/
-    short_name: rocky_9_1_highavailability
-    sync_group: rocky_9
-    distribution_name: rocky-9.1-highavailability-
-    sync: false
-
-  # Base Rocky Linux 9.2 repositories
-  - name: Rocky Linux 9.2 - AppStream
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.2&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.2/AppStream/x86_64/os/
-    short_name: rocky_9_2_appstream
-    sync_group: rocky_9
-    distribution_name: rocky-9.2-appstream-
-    sync: false
-  - name: Rocky Linux 9.2 - BaseOS
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.2&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.2/BaseOS/x86_64/os/
-    short_name: rocky_9_2_baseos
-    sync_group: rocky_9
-    distribution_name: rocky-9.2-baseos-
-    sync: false
-  - name: Rocky Linux 9.2 - Extras
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.2&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.2/extras/x86_64/os/
-    short_name: rocky_9_2_extras
-    sync_group: rocky_9
-    distribution_name: rocky-9.2-extras-
-    sync: false
-
-  # Additional Rocky Linux 9.2 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux 9.2 - CRB
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.2&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.2/CRB/x86_64/os/
-    short_name: rocky_9_2_crb
-    sync_group: rocky_9
-    distribution_name: rocky-9.2-crb-
-    sync: false
-  - name: Rocky Linux 9.2 - HighAvailability
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.2&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.2/highavailability/x86_64/os/
-    short_name: rocky_9_2_highavailability
-    sync_group: rocky_9
-    distribution_name: rocky-9.2-highavailability-
-    sync: false
-
-  # Base Rocky Linux 9.3 repositories
-  - name: Rocky Linux 9.3 - AppStream
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.3&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.3/AppStream/x86_64/os/
-    short_name: rocky_9_3_appstream
-    sync_group: rocky_9
-    distribution_name: rocky-9.3-appstream-
-    sync: false
-  - name: Rocky Linux 9.3 - BaseOS
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.3&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.3/BaseOS/x86_64/os/
-    short_name: rocky_9_3_baseos
-    sync_group: rocky_9
-    distribution_name: rocky-9.3-baseos-
-    sync: false
-  - name: Rocky Linux 9.3 - Extras
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.3&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.3/extras/x86_64/os/
-    short_name: rocky_9_3_extras
-    sync_group: rocky_9
-    distribution_name: rocky-9.3-extras-
-    sync: false
-
-  # Additional Rocky Linux 9.3 repositories
-  # No advanced virt, Ceph or OpenStack
-  - name: Rocky Linux 9.3 - CRB
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.3&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.3/CRB/x86_64/os/
-    short_name: rocky_9_3_crb
-    sync_group: rocky_9
-    distribution_name: rocky-9.3-crb-
-    sync: false
-  - name: Rocky Linux 9.3 - HighAvailability
-    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.3&arch=x86_64&country=NL&protocol=https
-    base_path: rocky/9.3/highavailability/x86_64/os/
-    short_name: rocky_9_3_highavailability
-    sync_group: rocky_9
-    distribution_name: rocky-9.3-highavailability-
-    sync: false
-
   # Base Rocky Linux 9.4 repositories
   - name: Rocky Linux 9.4 - AppStream
     url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.4&arch=x86_64&country=NL&protocol=https
diff --git a/ansible/inventory/group_vars/all/package-repos-deprecated b/ansible/inventory/group_vars/all/package-repos-deprecated
new file mode 100644
index 00000000..cc2dc56b
--- /dev/null
+++ b/ansible/inventory/group_vars/all/package-repos-deprecated
@@ -0,0 +1,513 @@
+---
+#############################################################################
+# The repos in this file are deprecated and are shown here for reference only
+#############################################################################
+
+# RPM
+
+# List of RPM package repositories.
+# Each item is a dict with the following items:
+# name: Repository name.
+# url: URL of upstream package mirror.
+# policy: Policy for upstream remote. Optional.
+# sync_policy: Sync policy for upstream remote. Optional.
+# base_path: Base path prefix for distributions.
+# short_name: Name used internally for variable names.
+# distribution_name: Name prefix for distributions. Version will be appended.
+# sync: Whether to sync the repository with a remote. Optional, default is true.
+# publish: Whether to publish and distribute the repository. Optional, default is true.
+deprecated_rpm_package_repos:
+  # Base CentOS 8 Stream repositories
+  - name: CentOS Stream 8 - AppStream
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=AppStream&infra=genclo
+    base_path: centos/8-stream/AppStream/x86_64/os/
+    short_name: centos_stream_8_appstream
+    sync_group: centos
+    distribution_name: centos-stream-8-appstream-
+    sync: false
+  - name: CentOS Stream 8 - BaseOS
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=BaseOS&infra=genclo
+    base_path: centos/8-stream/BaseOS/x86_64/os/
+    short_name: centos_stream_8_baseos
+    sync_group: centos
+    distribution_name: centos-stream-8-baseos-
+    sync: false
+  - name: CentOS Stream 8 - Extras
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=extras&infra=genclo
+    base_path: centos/8-stream/extras/x86_64/os/
+    short_name: centos_stream_8_extras
+    sync_group: centos
+    distribution_name: centos-stream-8-extras-
+    sync: false
+  - name: CentOS Stream 8 - Extras common packages
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=extras-extras-common&infra=genclo
+    base_path: centos/8-stream/extras/x86_64/extras-common/
+    short_name: centos_stream_8_extras_common
+    sync_group: centos
+    distribution_name: centos-stream-8-extras-common-
+    sync: false
+
+  # Additional CentOS 8 Stream repositories
+  - name: CentOS Stream 8 - Advanced Virtualization
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=virt-advancedvirt-common
+    base_path: centos/8-stream/virt/x86_64/advancedvirt-common/
+    short_name: centos_stream_8_advanced_virtualization
+    sync_group: centos
+    distribution_name: centos-stream-8-advancedvirt-
+    sync: false
+  - name: CentOS Stream 8 - Ceph Nautilus
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=storage-ceph-nautilus
+    base_path: centos/8-stream/storage/x86_64/ceph-nautilus/
+    short_name: centos_stream_8_storage_ceph_nautilus
+    sync_group: centos
+    distribution_name: centos-stream-8-storage-ceph-nautilus-
+    sync: false
+  - name: CentOS Stream 8 - Ceph Pacific
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=storage-ceph-pacific
+    base_path: centos/8-stream/storage/x86_64/ceph-pacific/
+    short_name: centos_stream_8_storage_ceph_pacific
+    sync_group: centos
+    distribution_name: centos-stream-8-storage-ceph-pacific-
+    sync: false
+  - name: CentOS Stream 8 - Ceph Quincy
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=storage-ceph-quincy
+    base_path: centos/8-stream/storage/x86_64/ceph-quincy/
+    short_name: centos_stream_8_storage_ceph_quincy
+    sync_group: centos
+    distribution_name: centos-stream-8-storage-ceph-quincy-
+    sync: false
+  - name: CentOS Stream 8 - NFV Extras
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=nfv-network-extras
+    base_path: centos/8-stream/nfv/x86_64/network-extras/
+    short_name: centos_stream_8_nfv_extras
+    sync_group: centos
+    distribution_name: centos-stream-8-nfv-extras-
+    sync: false
+  - name: CentOS Stream 8 - NFV OpenvSwitch
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=nfv-openvswitch-2
+    base_path: centos/8-stream/nfv/x86_64/openvswitch-2/
+    short_name: centos_stream_8_nfv_openvswitch
+    sync_group: centos
+    distribution_name: centos-stream-8-nfv-openvswitch-
+    sync: false
+  - name: CentOS Stream 8 - OpenStack Wallaby
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=cloud-openstack-wallaby
+    base_path: centos/8-stream/cloud/x86_64/openstack-wallaby/
+    short_name: centos_stream_8_openstack_wallaby
+    sync_group: centos
+    distribution_name: centos-stream-8-openstack-wallaby-
+    sync: false
+  - name: CentOS Stream 8 - OpenStack Xena
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=cloud-openstack-xena
+    base_path: centos/8-stream/cloud/x86_64/openstack-xena/
+    short_name: centos_stream_8_openstack_xena
+    sync_group: centos
+    distribution_name: centos-stream-8-openstack-xena-
+    sync: false
+  - name: CentOS Stream 8 - OpenStack Yoga
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=cloud-openstack-yoga
+    base_path: centos/8-stream/cloud/x86_64/openstack-yoga/
+    short_name: centos_stream_8_openstack_yoga
+    sync_group: centos
+    distribution_name: centos-stream-8-openstack-yoga-
+    sync: false
+  - name: CentOS Stream 8 - OpsTools - collectd
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=opstools-collectd-5
+    base_path: centos/8-stream/opstools/x86_64/collectd-5/
+    short_name: centos_stream_8_opstools
+    sync_group: centos
+    distribution_name: centos-stream-8-opstools-
+    sync: false
+  - name: CentOS Stream 8 - PowerTools
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=PowerTools&infra=genclo
+    base_path: centos/8-stream/PowerTools/x86_64/os/
+    short_name: centos_stream_8_powertools
+    sync_group: centos
+    distribution_name: centos-stream-8-powertools-
+    sync: false
+  - name: CentOS Stream 8 - HighAvailability
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=HighAvailability&infra=genclo
+    base_path: centos/8-stream/HighAvailability/x86_64/os/
+    short_name: centos_stream_8_highavailability
+    sync_group: centos
+    distribution_name: centos-stream-8-highavailability-
+    sync: false
+  - name: CentOS Stream 8 - Kmods Main
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=kmods-packages-main&infra=genclo
+    base_path: centos/8-stream/kmods/x86_64/packages-main/
+    short_name: centos_stream_8_kmods_main
+    sync_group: centos
+    distribution_name: centos-stream-8-kmods-main-
+    sync: false
+  - name: CentOS Stream 8 - Kmods Rebuild
+    url: http://mirrorlist.centos.org/?release=8-stream&arch=x86_64&country=NL&repo=kmods-packages-rebuild&infra=genclo
+    base_path: centos/8-stream/kmods/x86_64/packages-rebuild/
+    short_name: centos_stream_8_kmods_rebuild
+    sync_group: centos
+    distribution_name: centos-stream-8-kmods-rebuild-
+    sync: false
+
+  # Base CentOS 8 Linux repositories
+  - name: CentOS Linux 8 - AppStream
+    sync: false
+    publish: false
+  - name: CentOS Linux 8 - BaseOS
+    sync: false
+    publish: false
+  - name: CentOS Linux 8 - Extras
+    sync: false
+    publish: false
+
+  # Additional CentOS 8 Linux repositories (used by Stream builds)
+  - name: CentOS 8 - Ceph Nautilus
+    base_path: centos/8/storage/x86_64/ceph-nautilus/
+    short_name: centos_8_storage_ceph_nautilus
+    sync_group: centos
+    distribution_name: centos-8-storage-ceph-nautilus-
+    sync: false
+  - name: CentOS 8 - Ceph Octopus
+    distribution_name: centos-8-storage-ceph-octopus-
+    sync: false
+    publish: false
+  - name: CentOS 8 - OpsTools - collectd
+    base_path: centos/8/opstools/x86_64/collectd-5/
+    short_name: centos_8_opstools
+    sync_group: centos
+    distribution_name: centos-8-opstools-
+    sync: false
+
+  # Additional CentOS 8 Linux repositories (not used by Stream builds)
+  - name: CentOS-8 - Advanced Virtualization
+    sync: false
+    publish: false
+  - name: CentOS-8 - NFV OpenvSwitch
+    sync: false
+    publish: false
+  - name: CentOS-8 - OpenStack Ussuri
+    sync: false
+    publish: false
+  - name: CentOS-8 - OpenStack Victoria
+    sync: false
+    publish: false
+  - name: CentOS Linux 8 - PowerTools
+    sync: false
+    publish: false
+
+  # Base Rocky Linux 8.5 repositories
+  - name: Rocky Linux 8.5 - AppStream
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.5&arch=x86_64&country=NL
+    base_path: rocky/8.5/AppStream/x86_64/os/
+    short_name: rocky_8_5_appstream
+    sync_group: rocky_8
+    distribution_name: rocky-8.5-appstream-
+    sync: false
+  - name: Rocky Linux 8.5 - BaseOS
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.5&arch=x86_64&country=NL
+    base_path: rocky/8.5/BaseOS/x86_64/os/
+    short_name: rocky_8_5_baseos
+    sync_group: rocky_8
+    distribution_name: rocky-8.5-baseos-
+    sync: false
+  - name: Rocky Linux 8.5 - Extras
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.5&arch=x86_64&country=NL
+    base_path: rocky/8.5/extras/x86_64/os/
+    short_name: rocky_8_5_extras
+    sync_group: rocky_8
+    distribution_name: rocky-8.5-extras-
+    sync: false
+
+  # Additional Rocky Linux 8.5 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux NFV 8.5
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-nfv-8.5&arch=x86_64&country=NL
+    base_path: rocky/8.5/nfv/x86_64/os/
+    short_name: rocky_8_5_nfv
+    sync_group: rocky_8
+    distribution_name: rocky-8.5-nfv-
+    sync: false
+  - name: Rocky Linux 8.5 - PowerTools
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.5&arch=x86_64&country=NL
+    base_path: rocky/8.5/PowerTools/x86_64/os/
+    short_name: rocky_8_5_powertools
+    sync_group: rocky_8
+    distribution_name: rocky-8.5-powertools-
+    sync: false
+
+  # Base Rocky Linux 8.6 repositories
+  - name: Rocky Linux 8.6 - AppStream
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.6&arch=x86_64&country=NL
+    base_path: rocky/8.6/AppStream/x86_64/os/
+    short_name: rocky_8_6_appstream
+    sync_group: rocky_8
+    distribution_name: rocky-8.6-appstream-
+    sync: false
+  - name: Rocky Linux 8.6 - BaseOS
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.6&arch=x86_64&country=NL
+    base_path: rocky/8.6/BaseOS/x86_64/os/
+    short_name: rocky_8_6_baseos
+    sync_group: rocky_8
+    distribution_name: rocky-8.6-baseos-
+    sync: false
+  - name: Rocky Linux 8.6 - Extras
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.6&arch=x86_64&country=NL
+    base_path: rocky/8.6/extras/x86_64/os/
+    short_name: rocky_8_6_extras
+    sync_group: rocky_8
+    distribution_name: rocky-8.6-extras-
+    sync: false
+
+  # Additional Rocky Linux 8.6 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux NFV 8.6
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-NFV-8.6&arch=x86_64&country=NL
+    base_path: rocky/8.6/nfv/x86_64/os/
+    short_name: rocky_8_6_nfv
+    sync_group: rocky_8
+    distribution_name: rocky-8.6-nfv-
+    sync: false
+  - name: Rocky Linux 8.6 - PowerTools
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.6&arch=x86_64&country=NL
+    base_path: rocky/8.6/PowerTools/x86_64/os/
+    short_name: rocky_8_6_powertools
+    sync_group: rocky_8
+    distribution_name: rocky-8.6-powertools-
+    sync: false
+  - name: Rocky Linux 8.6 - HighAvailability
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-8.6&arch=x86_64&country=NL
+    base_path: rocky/8.6/HighAvailability/x86_64/os/
+    short_name: rocky_8_6_highavailability
+    sync_group: rocky_8
+    distribution_name: rocky-8.6-highavailability-
+    sync: false
+
+  # Base Rocky Linux 8.7 repositories
+  - name: Rocky Linux 8.7 - AppStream
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.7&arch=x86_64&country=NL
+    base_path: rocky/8.7/AppStream/x86_64/os/
+    short_name: rocky_8_7_appstream
+    sync_group: rocky_8
+    distribution_name: rocky-8.7-appstream-
+    sync: false
+  - name: Rocky Linux 8.7 - BaseOS
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.7&arch=x86_64&country=NL
+    base_path: rocky/8.7/BaseOS/x86_64/os/
+    short_name: rocky_8_7_baseos
+    sync_group: rocky_8
+    distribution_name: rocky-8.7-baseos-
+    sync: false
+  - name: Rocky Linux 8.7 - Extras
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.7&arch=x86_64&country=NL
+    base_path: rocky/8.7/extras/x86_64/os/
+    short_name: rocky_8_7_extras
+    sync_group: rocky_8
+    distribution_name: rocky-8.7-extras-
+    sync: false
+
+  # Additional Rocky Linux 8.7 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux NFV 8.7
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-NFV-8.7&arch=x86_64&country=NL
+    base_path: rocky/8.7/nfv/x86_64/os/
+    short_name: rocky_8_7_nfv
+    sync_group: rocky_8
+    distribution_name: rocky-8.7-nfv-
+    sync: false
+  - name: Rocky Linux 8.7 - PowerTools
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.7&arch=x86_64&country=NL
+    base_path: rocky/8.7/PowerTools/x86_64/os/
+    short_name: rocky_8_7_powertools
+    sync_group: rocky_8
+    distribution_name: rocky-8.7-powertools-
+    sync: false
+  - name: Rocky Linux 8.7 - HighAvailability
+    url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-8.7&arch=x86_64&country=NL
+    base_path: rocky/8.7/HighAvailability/x86_64/os/
+    short_name: rocky_8_7_highavailability
+    sync_group: rocky_8
+    distribution_name: rocky-8.7-highavailability-
+    sync: false
+
+  # Base Rocky Linux 8.8 repositories
+  - name: Rocky Linux 8.8 - AppStream
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.8&arch=x86_64&country=NL
+    base_path: rocky/8.8/AppStream/x86_64/os/
+    short_name: rocky_8_8_appstream
+    sync_group: rocky_8
+    distribution_name: rocky-8.8-appstream-
+    sync: false
+  - name: Rocky Linux 8.8 - BaseOS
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.8&arch=x86_64&country=NL
+    base_path: rocky/8.8/BaseOS/x86_64/os/
+    short_name: rocky_8_8_baseos
+    sync_group: rocky_8
+    distribution_name: rocky-8.8-baseos-
+    sync: false
+  - name: Rocky Linux 8.8 - Extras
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-8.8&arch=x86_64&country=NL
+    base_path: rocky/8.8/extras/x86_64/os/
+    short_name: rocky_8_8_extras
+    sync_group: rocky_8
+    distribution_name: rocky-8.8-extras-
+    sync: false
+
+  # Additional Rocky Linux 8.8 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux NFV 8.8
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-NFV-8.8&arch=x86_64&country=NL
+    base_path: rocky/8.8/nfv/x86_64/os/
+    short_name: rocky_8_8_nfv
+    sync_group: rocky_8
+    distribution_name: rocky-8.8-nfv-
+    sync: false
+  - name: Rocky Linux 8.8 - PowerTools
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-PowerTools-8.8&arch=x86_64&country=NL
+    base_path: rocky/8.8/PowerTools/x86_64/os/
+    short_name: rocky_8_8_powertools
+    sync_group: rocky_8
+    distribution_name: rocky-8.8-powertools-
+    sync: false
+  - name: Rocky Linux 8.8 - HighAvailability
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-8.8&arch=x86_64&country=NL
+    base_path: rocky/8.8/HighAvailability/x86_64/os/
+    short_name: rocky_8_8_highavailability
+    sync_group: rocky_8
+    distribution_name: rocky-8.8-highavailability-
+    sync: false
+
+  # MLNX OFED 5.6-1.0.3.3 RHEL 8.6 repository
+  - name: Mellanox Technologies mlnx_ofed 5.6-1.0.3.3
+    url: https://linux.mellanox.com/public/repo/mlnx_ofed/5.6-1.0.3.3/rhel8.6/x86_64/
+    base_path: mlnx_ofed/5.6-1.0.3.3/rhel8.6/x86_64/
+    short_name: mlnx_ofed_5_6_1_0_3_3_rhel8_6
+    sync_group: third_party
+    distribution_name: mlnx_ofed-5.6-1.0.3.3-rhel8.6-
+    sync: false
+
+  # MLNX OFED 5.7-1.0.2.0 RHEL 8.6 repository
+  - name: Mellanox Technologies mlnx_ofed 5.7-1.0.2.0
+    url: https://linux.mellanox.com/public/repo/mlnx_ofed/5.7-1.0.2.0/rhel8.6/x86_64/
+    base_path: mlnx_ofed/5.7-1.0.2.0/rhel8.6/x86_64/
+    short_name: mlnx_ofed_5_7_1_0_2_0_rhel8_6
+    sync_group: third_party
+    distribution_name: mlnx_ofed-5.7-1.0.2.0-rhel8.6-
+    sync: false
+
+  # Base Rocky Linux 9.1 repositories
+  - name: Rocky Linux 9.1 - AppStream
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.1&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.1/AppStream/x86_64/os/
+    short_name: rocky_9_1_appstream
+    sync_group: rocky_9
+    distribution_name: rocky-9.1-appstream-
+    sync: false
+  - name: Rocky Linux 9.1 - BaseOS
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.1&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.1/BaseOS/x86_64/os/
+    short_name: rocky_9_1_baseos
+    sync_group: rocky_9
+    distribution_name: rocky-9.1-baseos-
+    sync: false
+  - name: Rocky Linux 9.1 - Extras
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.1&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.1/extras/x86_64/os/
+    short_name: rocky_9_1_extras
+    sync_group: rocky_9
+    distribution_name: rocky-9.1-extras-
+    sync: false
+
+  # Additional Rocky Linux 9.1 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux 9.1 - CRB
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.1&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.1/CRB/x86_64/os/
+    short_name: rocky_9_1_crb
+    sync_group: rocky_9
+    distribution_name: rocky-9.1-crb-
+    sync: false
+  - name: Rocky Linux 9.1 - HighAvailability
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.1&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.1/highavailability/x86_64/os/
+    short_name: rocky_9_1_highavailability
+    sync_group: rocky_9
+    distribution_name: rocky-9.1-highavailability-
+    sync: false
+
+  # Base Rocky Linux 9.2 repositories
+  - name: Rocky Linux 9.2 - AppStream
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.2&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.2/AppStream/x86_64/os/
+    short_name: rocky_9_2_appstream
+    sync_group: rocky_9
+    distribution_name: rocky-9.2-appstream-
+    sync: false
+  - name: Rocky Linux 9.2 - BaseOS
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.2&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.2/BaseOS/x86_64/os/
+    short_name: rocky_9_2_baseos
+    sync_group: rocky_9
+    distribution_name: rocky-9.2-baseos-
+    sync: false
+  - name: Rocky Linux 9.2 - Extras
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.2&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.2/extras/x86_64/os/
+    short_name: rocky_9_2_extras
+    sync_group: rocky_9
+    distribution_name: rocky-9.2-extras-
+    sync: false
+
+  # Additional Rocky Linux 9.2 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux 9.2 - CRB
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.2&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.2/CRB/x86_64/os/
+    short_name: rocky_9_2_crb
+    sync_group: rocky_9
+    distribution_name: rocky-9.2-crb-
+    sync: false
+  - name: Rocky Linux 9.2 - HighAvailability
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.2&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.2/highavailability/x86_64/os/
+    short_name: rocky_9_2_highavailability
+    sync_group: rocky_9
+    distribution_name: rocky-9.2-highavailability-
+    sync: false
+
+  # Base Rocky Linux 9.3 repositories
+  - name: Rocky Linux 9.3 - AppStream
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.3&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.3/AppStream/x86_64/os/
+    short_name: rocky_9_3_appstream
+    sync_group: rocky_9
+    distribution_name: rocky-9.3-appstream-
+    sync: false
+  - name: Rocky Linux 9.3 - BaseOS
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.3&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.3/BaseOS/x86_64/os/
+    short_name: rocky_9_3_baseos
+    sync_group: rocky_9
+    distribution_name: rocky-9.3-baseos-
+    sync: false
+  - name: Rocky Linux 9.3 - Extras
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.3&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.3/extras/x86_64/os/
+    short_name: rocky_9_3_extras
+    sync_group: rocky_9
+    distribution_name: rocky-9.3-extras-
+    sync: false
+
+  # Additional Rocky Linux 9.3 repositories
+  # No advanced virt, Ceph or OpenStack
+  - name: Rocky Linux 9.3 - CRB
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.3&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.3/CRB/x86_64/os/
+    short_name: rocky_9_3_crb
+    sync_group: rocky_9
+    distribution_name: rocky-9.3-crb-
+    sync: false
+  - name: Rocky Linux 9.3 - HighAvailability
+    url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.3&arch=x86_64&country=NL&protocol=https
+    base_path: rocky/9.3/highavailability/x86_64/os/
+    short_name: rocky_9_3_highavailability
+    sync_group: rocky_9
+    distribution_name: rocky-9.3-highavailability-
+    sync: false
diff --git a/ansible/validate-rpm-repos.yml b/ansible/validate-rpm-repos.yml
index d98d18ae..9999fa59 100644
--- a/ansible/validate-rpm-repos.yml
+++ b/ansible/validate-rpm-repos.yml
@@ -63,20 +63,19 @@
       assert:
         that:
           - rpm_package_repos_filtered | length == 1
-          - rpm_package_repos_filtered[0].short_name == 'centos_stream_8_baseos'
+          - rpm_package_repos_filtered[0].short_name == 'centos_stream_9_openstack_caracal_aarch64'
       vars:
-        rpm_package_repo_filter: centos_stream_8_baseos
+        rpm_package_repo_filter: centos_stream_9_openstack_caracal_aarch64
 
     - name: Assert that RPM package repository list can be filtered to multiple
       assert:
         that:
-          - rpm_package_repos_filtered | length == 4
-          - rpm_package_repos_filtered[0].short_name == 'centos_stream_8_baseos'
-          - rpm_package_repos_filtered[1].short_name == 'docker'
-          - rpm_package_repos_filtered[2].short_name == 'centos_stream_9_docker'
-          - rpm_package_repos_filtered[3].short_name == 'centos_stream_9_docker_aarch64'
+          - rpm_package_repos_filtered | length == 3
+          - rpm_package_repos_filtered[0].short_name == 'grafana'
+          - rpm_package_repos_filtered[1].short_name == 'centos_stream_9_openstack_caracal'
+          - rpm_package_repos_filtered[2].short_name == 'centos_stream_9_openstack_caracal_aarch64'
       vars:
-        rpm_package_repo_filter: docker centos_stream_8_baseos centos_stream_9_docker
+        rpm_package_repo_filter: centos_stream_9_openstack_caracal grafana
 
     - name: Assert that RPM package repository list can be filtered to one group
       assert: