diff --git a/hieradata/os/AlmaLinux/AlmaLinux8.yaml b/hieradata/os/AlmaLinux/AlmaLinux8.yaml
index e0b4a27..7861fca 100644
--- a/hieradata/os/AlmaLinux/AlmaLinux8.yaml
+++ b/hieradata/os/AlmaLinux/AlmaLinux8.yaml
@@ -1,11 +1,2 @@
 # hieradata/os/AlmaLinux/AlmaLinux8.yaml
 ---
-profiles::yum::global::managed_repos:
-  - 'base'
-  - 'appstream'
-  - 'epel'
-  - 'powertools'
-  - 'highavailability'
-  - 'puppet7'
-  - 'yum.postgresql.org'
-  - 'unkin'
diff --git a/hieradata/os/AlmaLinux/AlmaLinux9.yaml b/hieradata/os/AlmaLinux/AlmaLinux9.yaml
index c6e95cc..03c8c55 100644
--- a/hieradata/os/AlmaLinux/AlmaLinux9.yaml
+++ b/hieradata/os/AlmaLinux/AlmaLinux9.yaml
@@ -1,8 +1,2 @@
 # hieradata/os/AlmaLinux/AlmaLinux9.yaml
 ---
-profiles::yum::global::managed_repos:
-  - 'base'
-  - 'appstream'
-  - 'epel'
-  - 'puppet7'
-  - 'yum.postgresql.org'
diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml
index b0016ba..3665900 100644
--- a/hieradata/os/AlmaLinux/all_releases.yaml
+++ b/hieradata/os/AlmaLinux/all_releases.yaml
@@ -1,9 +1,5 @@
 # hieradata/os/almalinux/all_releases.yaml
 ---
-profiles::yum::base::baseurl: https://repos.main.unkin.net/almalinux
-profiles::yum::epel::baseurl: https://repos.main.unkin.net/epel
-profiles::yum::unkin::baseurl: https://repos.main.unkin.net/unkin
-profiles::yum::ovirt::baseurl: https://repos.main.unkin.net/centos
 profiles::firewall::firewalld::ensure_package: 'absent'
 profiles::firewall::firewalld::ensure_service: 'stopped'
 profiles::firewall::firewalld::enable_service: false
diff --git a/hieradata/roles/infra/ovirt/engine.yaml b/hieradata/roles/infra/ovirt/engine.yaml
index 7abde8c..b2a934d 100644
--- a/hieradata/roles/infra/ovirt/engine.yaml
+++ b/hieradata/roles/infra/ovirt/engine.yaml
@@ -1,14 +1,4 @@
 ---
-profiles::yum::global::managed_repos:
-  - 'virt-advanced-virtualization'
-  - 'storage-ceph-pacific'
-  - 'cloud-openstack-xena'
-  - 'messaging-rabbitmq-38'
-  - 'nfv-openvswitch-2'
-  - 'opstools-collectd-5'
-  - 'storage-gluster-10'
-  - 'virt-ovirt-45'
-
 profiles::yum::global::repos:
   centos_8_advanced_virtualization:
     name: 'virt-advanced-virtualization'
diff --git a/hieradata/roles/infra/ovirt/node.yaml b/hieradata/roles/infra/ovirt/node.yaml
index da74b08..762c1aa 100644
--- a/hieradata/roles/infra/ovirt/node.yaml
+++ b/hieradata/roles/infra/ovirt/node.yaml
@@ -1,15 +1,6 @@
 ---
 profiles::firewall::firewalld::ensure_package: 'installed'
 profiles::firewall::firewalld::ensure_service: 'running'
-profiles::yum::global::managed_repos:
-  - 'virt-advanced-virtualization'
-  - 'storage-ceph-pacific'
-  - 'cloud-openstack-xena'
-  - 'messaging-rabbitmq-38'
-  - 'nfv-openvswitch-2'
-  - 'opstools-collectd-5'
-  - 'storage-gluster-10'
-  - 'virt-ovirt-45'
 
 sudo::purge_ignore:
   - '50_vdsm'
diff --git a/site/profiles/manifests/puppet/agent.pp b/site/profiles/manifests/puppet/agent.pp
index c911f0d..76164c1 100644
--- a/site/profiles/manifests/puppet/agent.pp
+++ b/site/profiles/manifests/puppet/agent.pp
@@ -19,7 +19,7 @@ class profiles::puppet::agent (
       # Ensure the puppet-agent package is installed and locked to a specific version
       package { 'puppet-agent':
         ensure  => $puppet_version,
-        require => Class['profiles::yum::puppet7'],
+        require => Yumrepo['puppet'],
       }
 
       # versionlock puppet-agent
diff --git a/site/profiles/manifests/yum/base.pp b/site/profiles/manifests/yum/base.pp
deleted file mode 100644
index 47eb2b9..0000000
--- a/site/profiles/manifests/yum/base.pp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Class: profiles::yum::base
-#
-# This class manages the 'base', extras' and 'appstream' yum
-# repositories for a system, based on the provided list of managed repositories.
-class profiles::yum::base (
-  Array[String] $managed_repos,
-  String        $baseurl,
-  Enum[
-    'daily',
-    'weekly',
-    'monthly'
-  ]             $snapshot = 'daily',
-) {
-  $release = $facts['os']['release']['full']
-  $basearch = $facts['os']['architecture']
-
-  if 'base' in $managed_repos {
-    yumrepo { 'base':
-      name    => 'base',
-      descr   => 'base repository',
-      target  => '/etc/yum.repos.d/base.repo',
-      baseurl => "${baseurl}/${release}/BaseOS-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/${release}/BaseOS-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
-    }
-  }
-
-  if 'extras' in $managed_repos {
-    yumrepo { 'extras':
-      name    => 'extras',
-      descr   => 'extras repository',
-      target  => '/etc/yum.repos.d/extras.repo',
-      baseurl => "${baseurl}/${release}/extras-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/${release}/extras-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
-    }
-  }
-
-  if 'appstream' in $managed_repos {
-    yumrepo { 'appstream':
-      name    => 'appstream',
-      descr   => 'appstream repository',
-      target  => '/etc/yum.repos.d/appstream.repo',
-      baseurl => "${baseurl}/${release}/AppStream-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/${release}/AppStream-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
-    }
-  }
-
-  if 'powertools' in $managed_repos {
-    yumrepo { 'powertools':
-      name    => 'powertools',
-      descr   => 'powertools repository',
-      target  => '/etc/yum.repos.d/powertools.repo',
-      baseurl => "${baseurl}/${release}/PowerTools-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/${release}/PowerTools-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
-    }
-  }
-
-  if 'highavailability' in $managed_repos {
-    yumrepo { 'highavailability':
-      name    => 'highavailability',
-      descr   => 'highavailability repository',
-      target  => '/etc/yum.repos.d/highavailability.repo',
-      baseurl => "${baseurl}/${release}/HighAvailability-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/${release}/HighAvailability-${snapshot}/${basearch}/os/RPM-GPG-KEY-${facts['os']['name']}",
-    }
-  }
-}
diff --git a/site/profiles/manifests/yum/epel.pp b/site/profiles/manifests/yum/epel.pp
deleted file mode 100644
index b6c9f43..0000000
--- a/site/profiles/manifests/yum/epel.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Class: profiles::yum::epel
-#
-# This class manages the EPEL yum repository for the system.
-class profiles::yum::epel (
-  Array[String] $managed_repos,
-  String        $baseurl,
-  Enum[
-    'daily',
-    'weekly',
-    'monthly'
-  ]             $snapshot = 'daily',
-) {
-  $release = $facts['os']['release']['major']
-  $basearch = $facts['os']['architecture']
-
-  if 'epel' in $managed_repos {
-    yumrepo { 'epel':
-      name    => 'epel',
-      descr   => 'epel repository',
-      target  => '/etc/yum.repos.d/epel.repo',
-      baseurl => "${baseurl}/${release}/Everything-${snapshot}/${basearch}/os/",
-      gpgkey  => "${baseurl}/${release}/Everything-${snapshot}/${basearch}/os/RPM-GPG-KEY-EPEL-${release}",
-    }
-  }
-}
diff --git a/site/profiles/manifests/yum/global.pp b/site/profiles/manifests/yum/global.pp
index 98a90d4..2f515ab 100644
--- a/site/profiles/manifests/yum/global.pp
+++ b/site/profiles/manifests/yum/global.pp
@@ -1,8 +1,4 @@
 # Class: profiles::yum::global
-#
-# This class manages global YUM configurations and optionally includes the
-# base and EPEL yum repository profiles based on the content of the
-# $managed_repos parameter, which is an array of repository names.
 class profiles::yum::global (
   Hash     $repos = {},
   Boolean  $purge = true,
diff --git a/site/profiles/manifests/yum/mariadb.pp b/site/profiles/manifests/yum/mariadb.pp
deleted file mode 100644
index 3c6c4e6..0000000
--- a/site/profiles/manifests/yum/mariadb.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Class: profiles::yum::mariadb
-#
-# This class manages the mariadb yum repository for the system.
-#
-class profiles::yum::mariadb (
-  String        $baseurl = 'https://repos.main.unkin.net',
-  String        $version = '11.2',
-  Enum[
-    'daily',
-    'weekly',
-    'monthly'
-  ]             $snapshot = 'daily',
-) {
-  $release = $facts['os']['release']['major']
-  $basearch = $facts['os']['architecture']
-
-  yumrepo { 'mariadb':
-    name    => 'mariadb',
-    descr   => 'mariadb repository',
-    target  => '/etc/yum.repos.d/mariadb.repo',
-    baseurl => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/",
-    gpgkey  => "${baseurl}/mariadb/${version}/el${release}-${snapshot}/${basearch}/os/RPM-GPG-KEY-MariaDB",
-    require => Class['profiles::pki::vaultca'],
-  }
-}
diff --git a/site/profiles/manifests/yum/ovirt.pp b/site/profiles/manifests/yum/ovirt.pp
deleted file mode 100644
index d04b145..0000000
--- a/site/profiles/manifests/yum/ovirt.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Class: profiles::yum::ovirt
-class profiles::yum::ovirt (
-  Array[String] $managed_repos,
-  String        $baseurl,
-  Enum[
-    'daily',
-    'weekly',
-    'monthly'
-  ]             $snapshot = 'daily',
-) {
-  $release = $facts['os']['release']['major']
-  $basearch = $facts['os']['architecture']
-
-  $centos_nonstream = [
-    'virt-advanced-virtualization',
-    'storage-ceph-pacific'
-  ]
-  $centos_stream = [
-    'cloud-openstack-xena',
-    'messaging-rabbitmq-38',
-    'nfv-openvswitch-2',
-    'opstools-collectd-5',
-    'storage-gluster-10',
-    'virt-ovirt-45'
-  ]
-  $centos_nonstream.each |$name| {
-    if $name in $managed_repos {
-      yumrepo { $name:
-        name     => $name,
-        descr    => $name,
-        target   => '/etc/yum.repos.d/ovirt.repo',
-        baseurl  => "${baseurl}/${release}/${name}-20240311/${basearch}/os/",
-        gpgcheck => false,
-      }
-    }
-  }
-  $centos_stream.each |$name| {
-    if $name in $managed_repos {
-      yumrepo { $name:
-        name     => $name,
-        descr    => $name,
-        target   => '/etc/yum.repos.d/ovirt.repo',
-        baseurl  => "${baseurl}/${release}-stream/${name}-20240311/${basearch}/os/",
-        gpgcheck => false,
-      }
-    }
-  }
-}
diff --git a/site/profiles/manifests/yum/puppet7.pp b/site/profiles/manifests/yum/puppet7.pp
deleted file mode 100644
index ffcbbf4..0000000
--- a/site/profiles/manifests/yum/puppet7.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Class: profiles::yum::epel
-#
-# This class manages the puppet7 yum repository for the system.
-class profiles::yum::puppet7 (
-  Array[String] $managed_repos,
-  String        $baseurl = 'http://repos.main.unkin.net/puppet7',
-) {
-  $releasever = $facts['os']['release']['major']
-  $basearch = $facts['os']['architecture']
-
-  if 'puppet7' in $managed_repos {
-    yumrepo { 'puppet7':
-      name    => 'puppet7',
-      descr   => 'puppet7 repository',
-      target  => '/etc/yum.repos.d/puppet7.repo',
-      baseurl => "${baseurl}/el/${releasever}-daily/${basearch}/os/",
-      gpgkey  => 'https://yum.puppet.com/RPM-GPG-KEY-puppet-20250406',
-      #gpgkey => "${baseurl}/el/${releasever}-daily/${basearch}/os/RPM-GPG-KEY-puppet",
-    }
-  }
-}
diff --git a/site/profiles/manifests/yum/unkin.pp b/site/profiles/manifests/yum/unkin.pp
deleted file mode 100644
index be5be37..0000000
--- a/site/profiles/manifests/yum/unkin.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# Class: profiles::yum::unkin
-class profiles::yum::unkin (
-  Array[String] $managed_repos,
-  String        $baseurl,
-  Enum[
-    'daily',
-    'weekly',
-    'monthly'
-  ]             $snapshot = 'daily',
-) {
-  $release = $facts['os']['release']['major']
-  $basearch = $facts['os']['architecture']
-
-  if 'unkin' in $managed_repos {
-    yumrepo { 'unkin':
-      name     => 'unkin',
-      descr    => 'unkin repository',
-      target   => '/etc/yum.repos.d/unkin.repo',
-      baseurl  => "${baseurl}/${::facts['os']['release']['major']}/${basearch}/os/",
-      gpgcheck => false,
-    }
-  }
-}