diff --git a/almalinux-crb.repo b/almalinux-crb.repo
index fcef7fa..8f78461 100644
--- a/almalinux-crb.repo
+++ b/almalinux-crb.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - CRB
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/CRB/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-highavailability.repo b/almalinux-highavailability.repo
index 743b686..ae432d4 100644
--- a/almalinux-highavailability.repo
+++ b/almalinux-highavailability.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - HighAvailability
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-kitten-release.spec b/almalinux-kitten-release.spec
index 8599b70..f5fdffb 100644
--- a/almalinux-kitten-release.spec
+++ b/almalinux-kitten-release.spec
@@ -10,7 +10,7 @@
 
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        0.18%{?dist}
+Release:        0.18%{?dist}.1
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -309,6 +309,7 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 %ifarch x86_64_v2
 echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
+echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %endif
 
 
@@ -366,6 +367,9 @@ echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildr
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18.1
+- Add x86_64_v2 macros
+
 * Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18
 - Rename to almalinux-kitten
 - Update repo paths and names
diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo
index 52fbe3c..cabed6e 100644
--- a/almalinux-nfv.repo
+++ b/almalinux-nfv.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - NFV
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo
index 58e0b60..4ca19f0 100644
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - ResilientStorage
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-rt.repo b/almalinux-rt.repo
index 09953ff..b948607 100644
--- a/almalinux-rt.repo
+++ b/almalinux-rt.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - RT
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/RT/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-sap.repo b/almalinux-sap.repo
index 30cdb1e..5f2bb03 100644
--- a/almalinux-sap.repo
+++ b/almalinux-sap.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - SAP
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
diff --git a/almalinux-saphana.repo b/almalinux-saphana.repo
index 544aed6..5363524 100644
--- a/almalinux-saphana.repo
+++ b/almalinux-saphana.repo
@@ -3,7 +3,7 @@ name=AlmaLinux Kitten $releasever - SAPHANA
 # mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana
 # baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
 baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-$basearch/
-enabled=1
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10