diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec
index 065358e..6e69f00 100644
--- a/SPECS/kernel-6.1.spec
+++ b/SPECS/kernel-6.1.spec
@@ -23,6 +23,16 @@
 # change below to w4T.xzdio):
 %global _binary_payload w3T.xzdio
 
+%ifarch x86_64
+%define _kasan 1
+%define _kmsan 1
+%define _kmemleak 1
+%else
+%define _kasan 0
+%define _kmsan 0
+%define _kmemleak 0
+%endif
+
 # Define the version of the Linux Kernel Archive tarball.
 %global LKAver 6.1.111
 %global lvc lvc4
@@ -1184,7 +1194,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
 cd ..
 
 
-pushd %{_builddir}/%{name}-%{version}/linux-%{KVERREL}${Variant:+-${Variant}}
+pushd %{_builddir}/%{name}-%{version}/linux-%{KVERREL}
 
 %if %{with_perf}
 %ifarch aarch64
@@ -1255,11 +1265,19 @@ popd > /dev/null
 popd > /dev/null
 
 %install
-
 %define __modsign_install_post \
 if [ "%{signmodules}" -eq "1" ]; then \
 	if [ "%{with_std}" -ne "0" ]; then \
-        %{SOURCE21} certs/signing_key.pem.sign${Variant:++${Variant}} certs/signing_key.x509.sign${Variant:++${Variant}} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}${Variant:++${Variant}}/ \
+        %{SOURCE21} linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.pem.sign linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
+	fi \
+	if [ "%{_kasan}" -ne "0" ]; then \
+        %{SOURCE21} linux-%{version}-%{release}.%{_build_arch}+kasan/certs/signing_key.pem.sign+kasan linux-%{version}-%{release}.%{_build_arch}+kasan/certs/signing_key.x509.sign+kasan $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+kasan/ \
+	fi \
+	if [ "%{_kmsan}" -ne "0" ]; then \
+        %{SOURCE21} linux-%{version}-%{release}.%{_build_arch}+kmsan/certs/signing_key.pem.sign+kmsan linux-%{version}-%{release}.%{_build_arch}+kmsan/certs/signing_key.x509.sign+kmsan $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+kmsan/ \
+	fi \
+	if [ "%{_kmemleak}" -ne "0" ]; then \
+        %{SOURCE21} linux-%{version}-%{release}.%{_build_arch}+kmemleak/certs/signing_key.pem.sign+kmemleak linux-%{version}-%{release}.%{_build_arch}+kmemleak/certs/signing_key.x509.sign+kmemleak $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+kmemleak/ \
 	fi \
 fi \
 if [ "%{zipmodules}" -eq "1" ]; then \
@@ -1271,13 +1289,12 @@ fi \
 # Ensure modules are signed *after* all invocations of
 # strip have occured, which are in __os_install_post.
 #
-pushd linux-%{KVERREL}${Variant:+-${Variant}} > /dev/null
-
 %define __spec_install_post \
 	%{__arch_install_post}\
 	%{__os_install_post}\
 	%{__modsign_install_post}
 
+pushd linux-%{KVERREL} > /dev/null
 
 # We estimate the size of the initramfs because rpm needs to take this size
 # into consideration when performing disk space calculations. (See bz #530778)