diff --git a/almalinux-ha.repo b/almalinux-ha.repo
index 1a94a73..87ba509 100644
--- a/almalinux-ha.repo
+++ b/almalinux-ha.repo
@@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [ha-source]
 name=AlmaLinux 8.6-beta - High Availability Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/ha-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/HighAvailability/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [ha-debuginfo]
 name=AlmaLinux 8.6-beta - High Availability Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/ha-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/HighAvailability/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/HighAvailability/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo
index 4dc361b..66028ab 100644
--- a/almalinux-nfv.repo
+++ b/almalinux-nfv.repo
@@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [nfv-source]
 name=AlmaLinux 8.6-beta - Real Time for NFV Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/NFV/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [nfv-debuginfo]
 name=AlmaLinux 8.6-beta - Real Time for NFV Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/NFV/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-powertools.repo b/almalinux-powertools.repo
index 235f359..84733a5 100644
--- a/almalinux-powertools.repo
+++ b/almalinux-powertools.repo
@@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [powertools-source]
 name=AlmaLinux 8.6-beta - PowerTools Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/powertools-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/PowerTools/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/PowerTools/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [powertools-debuginfo]
 name=AlmaLinux 8.6-beta - PowerTools Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/PowerTools/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo
index f7de648..17e84c6 100644
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [resilientstorage-source]
 name=AlmaLinux 8.6-beta - Resilient Storage Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/resilientstorage-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/ResilientStorage/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/ResilientStorage/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [resilientstorage-debuginfo]
 name=AlmaLinux 8.6-beta - Resilient Storage Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/resilientstorage-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/ResilientStorage/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/ResilientStorage/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-rt.repo b/almalinux-rt.repo
index 4328ac5..2c859ba 100644
--- a/almalinux-rt.repo
+++ b/almalinux-rt.repo
@@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [rt-source]
 name=AlmaLinux 8.6-beta - Real Time Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/rt-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/RT/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/RT/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [rt-debuginfo]
 name=AlmaLinux 8.6-beta - Real Time Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/rt-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/RT/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/RT/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux.repo b/almalinux.repo
index 01ab2ec..29a2a3b 100644
--- a/almalinux.repo
+++ b/almalinux.repo
@@ -28,7 +28,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [baseos-source]
 name=AlmaLinux 8.6-beta - BaseOS Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/baseos-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/BaseOS/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -36,7 +36,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [appstream-source]
 name=AlmaLinux 8.6-beta - AppStream Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/appstream-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/AppStream/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -44,7 +44,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [extras-source]
 name=AlmaLinux 8.6-beta - Extras Sources
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/extras-source
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/extras/Source/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/extras/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -53,7 +53,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [baseos-debuginfo]
 name=AlmaLinux 8.6-beta - BaseOS Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/BaseOS/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -61,7 +61,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [appstream-debuginfo]
 name=AlmaLinux 8.6-beta - AppStream Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/appstream-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/AppStream/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -69,7 +69,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 [extras-debuginfo]
 name=AlmaLinux 8.6-beta - Extras Debuginfo
 mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/extras-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/extras/debug/$basearch/
+# baseurl=https://repo.almalinux.org/vault/8.6-beta/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux