diff --git a/SPECS/almalinux-release.spec b/SPECS/almalinux-release.spec
index 803ec93..e0afe50 100644
--- a/SPECS/almalinux-release.spec
+++ b/SPECS/almalinux-release.spec
@@ -24,7 +24,6 @@ Release:        0.14%{?dist}
 Summary:        %{distro} release files
 License:        GPLv2
 URL:            https://almalinux.org
-BuildArch:      noarch
 
 Provides:       centos-release = %{version}-%{release}
 
@@ -107,7 +106,6 @@ Requires:       almalinux-gpg-keys = %{version}-%{release}
 %package -n almalinux-gpg-keys
 Summary:        %{distro} RPM keys
 
-
 %description
 %{distro} release files.
 
@@ -120,17 +118,16 @@ This package provides the package repository files for %{distro}.
 %description -n almalinux-gpg-keys
 This package provides the RPM signature keys for %{distro}.
 
-
 %install
 # copy license and contributors doc here for %%license and %%doc macros
 mkdir -p ./docs
-cp %{SOURCE201} %{SOURCE202} ./docs
+cp %{SOURCE201} ./docs
 
 # create /etc/system-release and /etc/redhat-release
 install -d -m 0755 %{buildroot}%{_sysconfdir}
-echo "%{distro} release %{major}" > %{buildroot}%{_sysconfdir}/centos-release
-ln -s centos-release %{buildroot}%{_sysconfdir}/system-release
-ln -s centos-release %{buildroot}%{_sysconfdir}/redhat-release
+echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" > %{buildroot}%{_sysconfdir}/almalinux-release
+ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
+ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 
 # -------------------------------------------------------------------------
 # Definitions for /etc/os-release and for macros in macros.dist.  These
@@ -319,6 +316,10 @@ install -p -m 0644 %{SOURCE512} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
 echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream
 
+# copy GPG keys
+install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
+
 # These variables should be set in the build environment to change rpm names
 %if 0%{?x86_64_v2} == 1
 echo '%%_build_name_fmt %%{ARCH}_v2/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}_v2.rpm' > %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
@@ -329,11 +330,6 @@ echo '%%_build_name_fmt %%{ARCH}_fp/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}_fp
 echo '%x86_64_fp 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp
 %endif
 
-# copy GPG keys
-install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
-
-
 
 %files
 %license docs/LICENSE
@@ -354,6 +350,12 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 %{_prefix}/lib/systemd/system-preset/*
 %{_prefix}/lib/systemd/user-preset/*
 %{_prefix}/lib/sysctl.d/50-redhat.conf
+%if 0%{?x86_64_fp} == 1
+%config(noreplace) %{_sysconfdir}/rpm/macros.arch_fp
+%endif
+%if 0%{?x86_64_v2} == 1
+%config(noreplace) %{_sysconfdir}/rpm/macros.arch_v2
+%endif
 
 %files -n almalinux-sb-certs
 # Note to future packagers:
@@ -386,7 +388,6 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 %files -n almalinux-gpg-keys
 %{_sysconfdir}/pki/rpm-gpg
 
-
 %changelog
 * Tue Jul 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.14
 - AlmaLinux 10 beta release