diff --git a/90-default.preset b/90-default.preset
index 7b67ab3..4e5d530 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -195,5 +195,5 @@ enable dbus-daemon.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1967515
 enable nfs-client.target
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2106814
+# https://bugzilla.redhat.com/show_bug.cgi?id=2126605
 enable clevis-luks-askpass.path
diff --git a/almalinux-ha.repo b/almalinux-ha.repo
index 50b000f..8452c52 100644
--- a/almalinux-ha.repo
+++ b/almalinux-ha.repo
@@ -1,9 +1,9 @@
 # almalinux-ha.repo
 
 [ha]
-name=AlmaLinux 8.7-beta - High Availability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/HighAvailability/$basearch/os/
+name=AlmaLinux 8.8-beta - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/ha
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/HighAvailability/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [ha-source]
-name=AlmaLinux 8.7-beta - High Availability Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/HighAvailability/Source/
+name=AlmaLinux 8.8-beta - HighAvailability Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/ha-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [ha-debuginfo]
-name=AlmaLinux 8.7-beta - High Availability Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/HighAvailability/debug/$basearch/
+name=AlmaLinux 8.8-beta - HighAvailability debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/ha-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-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 cfa2b05..388967d 100644
--- a/almalinux-nfv.repo
+++ b/almalinux-nfv.repo
@@ -1,9 +1,9 @@
 # almalinux-nfv.repo
 
 [nfv]
-name=AlmaLinux 8.7-beta - Real Time for NFV
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/nfv
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/NFV/$basearch/os/
+name=AlmaLinux 8.8-beta - Real Time for NFV
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/nfv
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/NFV/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [nfv-source]
-name=AlmaLinux 8.7-beta - Real Time for NFV Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/nfv-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/NFV/Source/
+name=AlmaLinux 8.8-beta - Real Time for NFV Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/nfv-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/NFV/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [nfv-debuginfo]
-name=AlmaLinux 8.7-beta - Real Time for NFV Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/nfv-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/NFV/debug/$basearch/
+name=AlmaLinux 8.8-beta - Real Time for NFV Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/nfv-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-plus.repo b/almalinux-plus.repo
new file mode 100644
index 0000000..0540f62
--- /dev/null
+++ b/almalinux-plus.repo
@@ -0,0 +1,28 @@
+# almalinux-plus.repo
+
+[plus]
+name=AlmaLinux 8.8-beta - Plus
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/plus
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/plus/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Sources
+[plus-source]
+name=AlmaLinux 8.8-beta - Plus Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/plus-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/plus/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+## Debuginfo
+[plus-debuginfo]
+name=AlmaLinux 8.8-beta - Plus debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/plus-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/plus/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 1226204..6fc67a6 100644
--- a/almalinux-powertools.repo
+++ b/almalinux-powertools.repo
@@ -1,9 +1,9 @@
 # almalinux-powertools.repo
 
 [powertools]
-name=AlmaLinux 8.7-beta - PowerTools
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/PowerTools/$basearch/os/
+name=AlmaLinux 8.8-beta - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/powertools
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/PowerTools/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [powertools-source]
-name=AlmaLinux 8.7-beta - PowerTools Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/PowerTools/Source/
+name=AlmaLinux 8.8-beta - PowerTools Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/powertools-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/PowerTools/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [powertools-debuginfo]
-name=AlmaLinux 8.7-beta - PowerTools Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/PowerTools/debug/$basearch/
+name=AlmaLinux 8.8-beta - PowerTools debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-release.spec b/almalinux-release.spec
index eb0915f..ed825c3 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -1,16 +1,15 @@
 %define debug_package %{nil}
 %define product_family AlmaLinux
-%define release_name Stone Smilodon
+%define release_name Sapphire Caracal
 %define contentdir almalinux
 %define infra_var stock
 %define base_release_version 8
-%define full_release_version 8.7
+%define full_release_version 8.8
 %define dist_release_version 8
-%define upstream_rel_long 8.7-0.2
-%define upstream_rel 8.7
-%define almalinux_rel 0.2
+%define upstream_rel_long 8.8-0.5
+%define upstream_rel 8.8
+%define almalinux_rel 0.5
 %define dist .el%{dist_release_version}
-
 %define beta Beta
 
 # The anaconda scripts in %%{_libexecdir} can create false requirements
@@ -50,8 +49,9 @@ Source300:      almalinux.repo
 Source301:      almalinux-ha.repo
 Source302:      almalinux-powertools.repo
 Source303:      almalinux-resilientstorage.repo
-Source304:      almalinux-sap.repo
-Source305:      almalinux-saphana.repo
+Source304:      almalinux-plus.repo
+Source305:      almalinux-sap.repo
+Source306:      almalinux-saphana.repo
 
 # Only for x86_64
 Source310:      almalinux-rt.repo
@@ -126,6 +126,7 @@ install -m 644 %{SOURCE302} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE303} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE304} %{buildroot}/etc/yum.repos.d
 install -m 644 %{SOURCE305} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
 
 # RT and NFV are only for x86_64
 %ifarch x86_64
@@ -136,6 +137,7 @@ install -m 644 %{SOURCE311} %{buildroot}/etc/yum.repos.d
 mkdir -p -m 755 %{buildroot}/etc/dnf/vars
 echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra
 echo "%{contentdir}" >%{buildroot}/etc/dnf/vars/contentdir
+echo "%{base_release_version}-stream" > %{buildroot}/etc/dnf/vars/stream
 
 # set up the dist tag macros
 install -d -m 755 %{buildroot}/etc/rpm
@@ -179,12 +181,13 @@ rm -rf %{buildroot}
 ##/etc/centos-release-upstream
 /etc/almalinux-release
 /etc/almalinux-release-upstream
-/etc/dnf/
+/etc/dnf/vars/*
 /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 %config(noreplace) /etc/yum.repos.d/almalinux.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-powertools.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-resilientstorage.repo
+%config(noreplace) /etc/yum.repos.d/almalinux-plus.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-sap.repo
 %config(noreplace) /etc/yum.repos.d/almalinux-saphana.repo
 %ifarch x86_64
@@ -197,17 +200,34 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/issue.net
 /etc/rpm/macros.dist
 %{_docdir}/redhat-release
-%{_docdir}/almalinux-release/*
+%{_docdir}/almalinux-release
 %{_datadir}/redhat-release
-%{_datadir}/almalinux-release/*
+%{_datadir}/almalinux-release
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
-* Fri Oct 07 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-0.2
-- 8.7 beta release
+* Wed Mar 29 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 8.8-0.5
+- 8.8 beta release
+
+* Sat Nov 19 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-3
+- Fixed ownership of dirs (albz#328)
+
+* Wed Nov 09 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-2
+- Add stream dnf variable for CentOS SIG repos compatibility
+
+* Mon Nov 07 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.7-1
+- 8.7 stable release
 - Add SAP and SAPHANA repos
-- Enable countme
+
+* Wed Jun 22 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-2
+- Add more compatibility variables to /etc/os-release
+
+* Thu May 19 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-1
+- Bump release
+
+* Tue May 10 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.1
+- 8.6 stable release
 
 * Thu Mar 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 8.6-0.0
 - 8.6 beta release
diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo
index 00f4b68..811b0e9 100644
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@@ -1,9 +1,9 @@
 # almalinux-resilientstorage.repo
 
 [resilientstorage]
-name=AlmaLinux 8.7-beta - Resilient Storage
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/ResilientStorage/$basearch/os/
+name=AlmaLinux 8.8-beta - ResilientStorage
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/resilientstorage
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/ResilientStorage/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [resilientstorage-source]
-name=AlmaLinux 8.7-beta - Resilient Storage Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/ResilientStorage/Source/
+name=AlmaLinux 8.8-beta - ResilientStorage Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/resilientstorage-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/ResilientStorage/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [resilientstorage-debuginfo]
-name=AlmaLinux 8.7-beta - Resilient Storage Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/ResilientStorage/debug/$basearch/
+name=AlmaLinux 8.8-beta - ResilientStorage debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/resilientstorage-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-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 536b62e..98287b2 100644
--- a/almalinux-rt.repo
+++ b/almalinux-rt.repo
@@ -1,9 +1,9 @@
 # almalinux-rt.repo
 
 [rt]
-name=AlmaLinux 8.7-beta - Real Time
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/RT/$basearch/os/
+name=AlmaLinux 8.8-beta - Real Time
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/rt
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/RT/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [rt-source]
-name=AlmaLinux 8.7-beta - Real Time Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/RT/Source/
+name=AlmaLinux 8.8-beta - Real Time Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/rt-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/RT/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [rt-debuginfo]
-name=AlmaLinux 8.7-beta - Real Time Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/RT/debug/$basearch/
+name=AlmaLinux 8.8-beta - Real Time Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/rt-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/RT/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-sap.repo b/almalinux-sap.repo
index 36cef04..2966165 100644
--- a/almalinux-sap.repo
+++ b/almalinux-sap.repo
@@ -1,9 +1,9 @@
 # almalinux-sap.repo
 
 [sap]
-name=AlmaLinux 8.7-beta - SAP
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/sap
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/SAP/$basearch/os/
+name=AlmaLinux 8.8-beta - SAP
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/sap
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/SAP/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [sap-source]
-name=AlmaLinux 8.7-beta - SAP Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/sap-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/SAP/Source/
+name=AlmaLinux 8.8-beta - SAP Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/sap-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/SAP/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [sap-debuginfo]
-name=AlmaLinux 8.7-beta - SAP Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/sap-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/SAP/debug/$basearch/
+name=AlmaLinux 8.8-beta - SAP Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/sap-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/SAP/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-saphana.repo b/almalinux-saphana.repo
index 5ae1001..f7f3f94 100644
--- a/almalinux-saphana.repo
+++ b/almalinux-saphana.repo
@@ -1,9 +1,9 @@
 # almalinux-saphana.repo
 
 [saphana]
-name=AlmaLinux 8.7-beta - SAP HANA
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/saphana
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/SAPHANA/$basearch/os/
+name=AlmaLinux 8.8-beta - SAP HANA
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/saphana
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/SAPHANA/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -11,18 +11,18 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [saphana-source]
-name=AlmaLinux 8.7-beta - SAP HANA Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/saphana-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/SAPHANA/Source/
+name=AlmaLinux 8.8-beta - SAP HANA Sources
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/saphana-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/SAPHANA/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [saphana-debuginfo]
-name=AlmaLinux 8.7-beta - SAP HANA Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/saphana-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/SAPHANA/debug/$basearch/
+name=AlmaLinux 8.8-beta - SAP HANA Debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/saphana-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/SAPHANA/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 f5a33af..b659410 100644
--- a/almalinux.repo
+++ b/almalinux.repo
@@ -1,27 +1,27 @@
 # almalinux.repo
 
 [baseos]
-name=AlmaLinux 8.7-beta - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/BaseOS/$basearch/os/
+name=AlmaLinux 8.8-beta - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/baseos
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [appstream]
-name=AlmaLinux 8.7-beta - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/AppStream/$basearch/os/
+name=AlmaLinux 8.8-beta - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/appstream
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/AppStream/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [extras]
-name=AlmaLinux 8.7-beta - Extras
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras
-# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/extras/$basearch/os/
+name=AlmaLinux 8.8-beta - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/extras
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/extras/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -29,50 +29,50 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Sources
 [baseos-source]
-name=AlmaLinux 8.7-beta - BaseOS Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/BaseOS/Source/
+name=AlmaLinux 8.8-beta - BaseOS Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/baseos-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [appstream-source]
-name=AlmaLinux 8.7-beta - AppStream Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/AppStream/Source/
+name=AlmaLinux 8.8-beta - AppStream Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/appstream-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [extras-source]
-name=AlmaLinux 8.7-beta - Extras Sources
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras-source
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/extras/Source/
+name=AlmaLinux 8.8-beta - Extras Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/extras-source
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/extras/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 ## Debuginfo
 [baseos-debuginfo]
-name=AlmaLinux 8.7-beta - BaseOS Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/BaseOS/debug/$basearch/
+name=AlmaLinux 8.8-beta - BaseOS debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/baseos-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [appstream-debuginfo]
-name=AlmaLinux 8.7-beta - AppStream Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/AppStream/debug/$basearch/
+name=AlmaLinux 8.8-beta - AppStream debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/appstream-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 
 [extras-debuginfo]
-name=AlmaLinux 8.7-beta - Extras Debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras-debuginfo
-# baseurl=https://repo.almalinux.org/vault/8.7-beta/extras/debug/$basearch/
+name=AlmaLinux 8.8-beta - Extras debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.8-beta/extras-debuginfo
+# baseurl=https://repo.almalinux.org/vault/8.8-beta/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux