diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec
index d98b02a..fa4506d 100644
--- a/SPECS/leapp-repository.spec
+++ b/SPECS/leapp-repository.spec
@@ -281,7 +281,7 @@ Requires:   libdb-utils
 %patch -P 0003 -p1
 %patch -P 0004 -p1
 %patch -P 0005 -p1
-%patch -P 0006 -p1
+# %patch -P 0006 -p1 # the patch is a part of Vendors support
 %patch -P 0007 -p1
 %patch -P 0008 -p1
 %patch -P 0009 -p1
@@ -314,7 +314,7 @@ Requires:   libdb-utils
 %patch -P 0036 -p1
 %patch -P 0037 -p1
 %patch -P 0038 -p1
-%patch -P 0039 -p1
+# %patch -P 0039 -p1 # ELevate provides own upgrade_paths.json and version.py
 %patch -P 0040 -p1
 %patch -P 0041 -p1
 %patch -P 0100 -p1
@@ -381,12 +381,15 @@ done;
 %doc README.md
 %license LICENSE
 %dir %{_sysconfdir}/leapp/transaction
-%exclude %dir %{_sysconfdir}/leapp/files
+%dir %{_sysconfdir}/leapp/files
 %dir %{leapp_datadir}
 %dir %{repositorydir}
 %dir %{custom_repositorydir}
 %dir %{leapp_python_sitelib}/leapp/cli/commands
 %config %{_sysconfdir}/leapp/files/*
+%exclude %{_sysconfdir}/leapp/files/device_driver_deprecation_data.json
+%exclude %{_sysconfdir}/leapp/files/pes-events.json
+%exclude %{_sysconfdir}/leapp/files/repomap.json
 # uncomment to package installed configs
 #%%config %%{_sysconfdir}/leapp/actor_conf.d/*
 %{_sysconfdir}/leapp/repos.d/*
@@ -399,6 +402,12 @@ done;
 # no files here
 
 %changelog
+* Mon Nov 25 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-4.elevate.1
+- Skip patches:
+ - 0006-ReadOfKernelArgsError-fix-the-error.patch
+ - 0039-Enable-IPU-for-EL-9.6-and-drop-EL-8.8-9.2.patch
+- Exclude data files (from /etc/leapp/files) which are part of leapp-data-*: device_driver_deprecation_data.json, pes-events.json, repomap.json
+
 * Tue Nov 19 2024 Matej Matuska <mmatuska@redhat.com> - 0.21.0-4
 - Use net.naming-scheme by default
 - Resolves: RHEL-23473