diff --git a/almalinux-appstream.repo b/almalinux-appstream.repo
index 9131cdc..3b8709b 100644
--- a/almalinux-appstream.repo
+++ b/almalinux-appstream.repo
@@ -1,7 +1,7 @@
 [appstream]
-name=AlmaLinux 9.5-beta - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/appstream
-# baseurl=https://vault.almalinux.org/9.5-beta/AppStream/$basearch/os/
+name=AlmaLinux $releasever - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=1
 
 [appstream-debuginfo]
-name=AlmaLinux 9.5-beta - AppStream - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/appstream-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/AppStream/debug/$basearch/
+name=AlmaLinux $releasever - AppStream - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debug
+# baseurl=https://vault.almalinux.org/$releasever/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [appstream-source]
-name=AlmaLinux 9.5-beta - AppStream - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/appstream-source
-# baseurl=https://vault.almalinux.org/9.5-beta/AppStream/Source/
+name=AlmaLinux $releasever - AppStream - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
+# baseurl=https://vault.almalinux.org/$releasever/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-baseos.repo b/almalinux-baseos.repo
index 62e6aff..c49fc3d 100644
--- a/almalinux-baseos.repo
+++ b/almalinux-baseos.repo
@@ -1,7 +1,7 @@
 [baseos]
-name=AlmaLinux 9.5-beta - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/baseos
-# baseurl=https://vault.almalinux.org/9.5-beta/BaseOS/$basearch/os/
+name=AlmaLinux $releasever - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=1
 
 [baseos-debuginfo]
-name=AlmaLinux 9.5-beta - BaseOS - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/baseos-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/BaseOS/debug/$basearch/
+name=AlmaLinux $releasever - BaseOS - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debug
+# baseurl=https://vault.almalinux.org/$releasever/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [baseos-source]
-name=AlmaLinux 9.5-beta - BaseOS - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/baseos-source
-# baseurl=https://vault.almalinux.org/9.5-beta/BaseOS/Source/
+name=AlmaLinux $releasever - BaseOS - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
+# baseurl=https://vault.almalinux.org/$releasever/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-crb.repo b/almalinux-crb.repo
index a902dce..a4523f0 100644
--- a/almalinux-crb.repo
+++ b/almalinux-crb.repo
@@ -1,7 +1,7 @@
 [crb]
-name=AlmaLinux 9.5-beta - CRB
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/crb
-# baseurl=https://vault.almalinux.org/9.5-beta/CRB/$basearch/os/
+name=AlmaLinux $releasever - CRB
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/CRB/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [crb-debuginfo]
-name=AlmaLinux 9.5-beta - CRB - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/crb-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/CRB/debug/$basearch/
+name=AlmaLinux $releasever - CRB - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-debug
+# baseurl=https://vault.almalinux.org/$releasever/CRB/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [crb-source]
-name=AlmaLinux 9.5-beta - CRB - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/crb-source
-# baseurl=https://vault.almalinux.org/9.5-beta/CRB/Source/
+name=AlmaLinux $releasever - CRB - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-source
+# baseurl=https://vault.almalinux.org/$releasever/CRB/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-extras.repo b/almalinux-extras.repo
index 1cef189..43ab797 100644
--- a/almalinux-extras.repo
+++ b/almalinux-extras.repo
@@ -1,7 +1,7 @@
 [extras]
-name=AlmaLinux 9.5-beta - Extras
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/extras
-# baseurl=https://vault.almalinux.org/9.5-beta/extras/$basearch/os/
+name=AlmaLinux $releasever - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [extras-debuginfo]
-name=AlmaLinux 9.5-beta - Extras - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/extras-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/extras/debug/$basearch/
+name=AlmaLinux $releasever - Extras - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debug
+# baseurl=https://vault.almalinux.org/$releasever/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [extras-source]
-name=AlmaLinux 9.5-beta - Extras - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/extras-source
-# baseurl=https://vault.almalinux.org/9.5-beta/extras/Source/
+name=AlmaLinux $releasever - Extras - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
+# baseurl=https://vault.almalinux.org/$releasever/extras/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-highavailability.repo b/almalinux-highavailability.repo
index f99776a..e69935d 100644
--- a/almalinux-highavailability.repo
+++ b/almalinux-highavailability.repo
@@ -1,7 +1,7 @@
 [highavailability]
-name=AlmaLinux 9.5-beta - HighAvailability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/highavailability
-# baseurl=https://vault.almalinux.org/9.5-beta/HighAvailability/$basearch/os/
+name=AlmaLinux $releasever - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [highavailability-debuginfo]
-name=AlmaLinux 9.5-beta - HighAvailability - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/highavailability-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/HighAvailability/debug/$basearch/
+name=AlmaLinux $releasever - HighAvailability - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability-debug
+# baseurl=https://vault.almalinux.org/$releasever/HighAvailability/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [highavailability-source]
-name=AlmaLinux 9.5-beta - HighAvailability - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/highavailability-source
-# baseurl=https://vault.almalinux.org/9.5-beta/HighAvailability/Source/
+name=AlmaLinux $releasever - HighAvailability - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability-source
+# baseurl=https://vault.almalinux.org/$releasever/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo
index 2c44a10..64eebe9 100644
--- a/almalinux-nfv.repo
+++ b/almalinux-nfv.repo
@@ -1,7 +1,7 @@
 [nfv]
-name=AlmaLinux 9.5-beta - NFV
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/nfv
-# baseurl=https://vault.almalinux.org/9.5-beta/NFV/$basearch/os/
+name=AlmaLinux $releasever - NFV
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [nfv-debuginfo]
-name=AlmaLinux 9.5-beta - NFV - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/nfv-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/NFV/debug/$basearch/
+name=AlmaLinux $releasever - NFV - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debug
+# baseurl=https://vault.almalinux.org/$releasever/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [nfv-source]
-name=AlmaLinux 9.5-beta - NFV - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/nfv-source
-# baseurl=https://vault.almalinux.org/9.5-beta/NFV/Source/
+name=AlmaLinux $releasever - NFV - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-source
+# baseurl=https://vault.almalinux.org/$releasever/NFV/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-plus.repo b/almalinux-plus.repo
index abd708f..57931bc 100644
--- a/almalinux-plus.repo
+++ b/almalinux-plus.repo
@@ -1,7 +1,7 @@
 [plus]
-name=AlmaLinux 9.5-beta - Plus
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/plus
-# baseurl=https://vault.almalinux.org/9.5-beta/plus/$basearch/os/
+name=AlmaLinux $releasever - Plus
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [plus-debuginfo]
-name=AlmaLinux 9.5-beta - Plus - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/plus-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/plus/debug/$basearch/
+name=AlmaLinux $releasever - Plus - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debug
+# baseurl=https://vault.almalinux.org/$releasever/plus/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [plus-source]
-name=AlmaLinux 9.5-beta - Plus - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/plus-source
-# baseurl=https://vault.almalinux.org/9.5-beta/plus/Source/
+name=AlmaLinux $releasever - Plus - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
+# baseurl=https://vault.almalinux.org/$releasever/plus/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-release.spec b/almalinux-release.spec
index 07335c5..b12397e 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -1,13 +1,13 @@
 %global distro  AlmaLinux
-%global release_name Teal Serval
+%global release_name Sage Margay
 %global major   9
-%global minor   5
+%global minor   6
 %global beta Beta
 %global eol_date 2032-06-01
 
 Name:           almalinux-release
 Version:        %{major}.%{minor}
-Release:        0.4%{?dist}
+Release:        0.0%{?dist}
 Summary:        %{distro} release files
 License:        GPLv2
 URL:            https://almalinux.org
@@ -279,6 +279,11 @@ install -p -m 0644 %{SOURCE510} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %endif
 
+%if %{defined beta}
+sed -i "s/\$releasever/%{major}.%{minor}-beta/g" %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+sed -i "s|https://repo.almalinux.org/almalinux/|https://vault.almalinux.org/|g" %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+%endif
+
 # dnf variables
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
 echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream
@@ -337,8 +342,14 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 
 
 %changelog
-* Tue Apr 30 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 9.5-0.4
-- 9.5 beta
+* Mon Mar 10 2025 Eduard Abdullin <eabdullin@almalinux.org> - 9.6-0.0
+- 9.6 beta
+
+* Thu Feb 06 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 9.5-2
+- Update AlmaLinux Secure Boot certificate
+
+* Tue Nov 12 2024 Eduard Abdullin <eabdullin@almalinux.org> - 9.5-1
+- 9.5 stable
 
 * Tue Apr 30 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 9.4-1
 - 9.4 stable
diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo
index 498f4c6..53ab72e 100644
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@@ -1,7 +1,7 @@
 [resilientstorage]
-name=AlmaLinux 9.5-beta - ResilientStorage
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/resilientstorage
-# baseurl=https://vault.almalinux.org/9.5-beta/ResilientStorage/$basearch/os/
+name=AlmaLinux $releasever - ResilientStorage
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [resilientstorage-debuginfo]
-name=AlmaLinux 9.5-beta - ResilientStorage - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/resilientstorage-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/ResilientStorage/debug/$basearch/
+name=AlmaLinux $releasever - ResilientStorage - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debug
+# baseurl=https://vault.almalinux.org/$releasever/ResilientStorage/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [resilientstorage-source]
-name=AlmaLinux 9.5-beta - ResilientStorage - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/resilientstorage-source
-# baseurl=https://vault.almalinux.org/9.5-beta/ResilientStorage/Source/
+name=AlmaLinux $releasever - ResilientStorage - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-source
+# baseurl=https://vault.almalinux.org/$releasever/ResilientStorage/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-rt.repo b/almalinux-rt.repo
index 593ebde..89fbd81 100644
--- a/almalinux-rt.repo
+++ b/almalinux-rt.repo
@@ -1,7 +1,7 @@
 [rt]
-name=AlmaLinux 9.5-beta - RT
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/rt
-# baseurl=https://vault.almalinux.org/9.5-beta/RT/$basearch/os/
+name=AlmaLinux $releasever - RT
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/RT/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [rt-debuginfo]
-name=AlmaLinux 9.5-beta - RT - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/rt-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/RT/debug/$basearch/
+name=AlmaLinux $releasever - RT - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debug
+# baseurl=https://vault.almalinux.org/$releasever/RT/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [rt-source]
-name=AlmaLinux 9.5-beta - RT - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/rt-source
-# baseurl=https://vault.almalinux.org/9.5-beta/RT/Source/
+name=AlmaLinux $releasever - RT - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-source
+# baseurl=https://vault.almalinux.org/$releasever/RT/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-sap.repo b/almalinux-sap.repo
index e4376ca..2014a18 100644
--- a/almalinux-sap.repo
+++ b/almalinux-sap.repo
@@ -1,7 +1,7 @@
 [sap]
-name=AlmaLinux 9.5-beta - SAP
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/sap
-# baseurl=https://vault.almalinux.org/9.5-beta/SAP/$basearch/os/
+name=AlmaLinux $releasever - SAP
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [sap-debuginfo]
-name=AlmaLinux 9.5-beta - SAP - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/sap-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/SAP/debug/$basearch/
+name=AlmaLinux $releasever - SAP - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-debug
+# baseurl=https://vault.almalinux.org/$releasever/SAP/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [sap-source]
-name=AlmaLinux 9.5-beta - SAP - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/sap-source
-# baseurl=https://vault.almalinux.org/9.5-beta/SAP/Source/
+name=AlmaLinux $releasever - SAP - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-source
+# baseurl=https://vault.almalinux.org/$releasever/SAP/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/almalinux-saphana.repo b/almalinux-saphana.repo
index 8f64dea..b0d7030 100644
--- a/almalinux-saphana.repo
+++ b/almalinux-saphana.repo
@@ -1,7 +1,7 @@
 [saphana]
-name=AlmaLinux 9.5-beta - SAPHANA
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/saphana
-# baseurl=https://vault.almalinux.org/9.5-beta/SAPHANA/$basearch/os/
+name=AlmaLinux $releasever - SAPHANA
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
 enabled=0
 gpgcheck=1
 countme=1
@@ -10,9 +10,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [saphana-debuginfo]
-name=AlmaLinux 9.5-beta - SAPHANA - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/saphana-debug
-# baseurl=https://vault.almalinux.org/9.5-beta/SAPHANA/debug/$basearch/
+name=AlmaLinux $releasever - SAPHANA - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-debug
+# baseurl=https://vault.almalinux.org/$releasever/SAPHANA/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
@@ -20,9 +20,9 @@ metadata_expire=86400
 enabled_metadata=0
 
 [saphana-source]
-name=AlmaLinux 9.5-beta - SAPHANA - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.5-beta/saphana-source
-# baseurl=https://vault.almalinux.org/9.5-beta/SAPHANA/Source/
+name=AlmaLinux $releasever - SAPHANA - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-source
+# baseurl=https://vault.almalinux.org/$releasever/SAPHANA/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
diff --git a/alsecureboot001.cer b/alsecureboot001.cer
index 6a4e99b..d086cd5 100644
Binary files a/alsecureboot001.cer and b/alsecureboot001.cer differ