diff --git a/.gitignore b/.gitignore
index 7d4ec36..a30bf5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tuned-2.20.0.tar.gz
+SOURCES/tuned-2.21.0.tar.gz
diff --git a/.tuned.metadata b/.tuned.metadata
index 0e43617..8a29916 100644
--- a/.tuned.metadata
+++ b/.tuned.metadata
@@ -1 +1 @@
-6a6c9a91ab1e556b884965432895cdf64ebd6016 SOURCES/tuned-2.20.0.tar.gz
+586db5263ea7dabcc57e24aceb249d397d7d0239 SOURCES/tuned-2.21.0.tar.gz
diff --git a/SOURCES/tuned-2.18.0-sd-load-balance.patch b/SOURCES/tuned-2.21.0-sd-load-balance.patch
similarity index 91%
rename from SOURCES/tuned-2.18.0-sd-load-balance.patch
rename to SOURCES/tuned-2.21.0-sd-load-balance.patch
index d42600c..f77f30f 100644
--- a/SOURCES/tuned-2.18.0-sd-load-balance.patch
+++ b/SOURCES/tuned-2.21.0-sd-load-balance.patch
@@ -1,5 +1,5 @@
 diff --git a/profiles/cpu-partitioning/script.sh b/profiles/cpu-partitioning/script.sh
-index 84e04fd..8677050 100755
+index ec422ca..cb378b7 100755
 --- a/profiles/cpu-partitioning/script.sh
 +++ b/profiles/cpu-partitioning/script.sh
 @@ -2,6 +2,38 @@
@@ -60,7 +60,7 @@ index 84e04fd..8677050 100755
  }
  
 diff --git a/profiles/cpu-partitioning/tuned.conf b/profiles/cpu-partitioning/tuned.conf
-index 979e40b..842e2bd 100644
+index 11f03cf..a682c9c 100644
 --- a/profiles/cpu-partitioning/tuned.conf
 +++ b/profiles/cpu-partitioning/tuned.conf
 @@ -35,8 +35,6 @@ no_balance_cores_expanded=${f:cpulist_unpack:${no_balance_cores}}
@@ -69,10 +69,10 @@ index 979e40b..842e2bd 100644
  
 -cmd_isolcpus=${f:regex_search_ternary:${no_balance_cores}:\s*[0-9]: isolcpus=${no_balance_cores}:}
 -
- [sysctl]
- kernel.hung_task_timeout_secs = 600
- kernel.nmi_watchdog = 0
-@@ -68,4 +66,4 @@ priority=10
+ [sysfs]
+ /sys/bus/workqueue/devices/writeback/cpumask = ${not_isolated_cpumask}
+ /sys/devices/virtual/workqueue/cpumask = ${not_isolated_cpumask}
+@@ -62,4 +60,4 @@ priority=10
  initrd_remove_dir=True
  initrd_dst_img=tuned-initrd.img
  initrd_add_dir=${tmpdir}
diff --git a/SPECS/tuned.spec b/SPECS/tuned.spec
index 0aceea2..a2bc5c8 100644
--- a/SPECS/tuned.spec
+++ b/SPECS/tuned.spec
@@ -34,7 +34,7 @@
 
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 2.20.0
+Version: 2.21.0
 Release: 1%{?prerel1}%{?dist}
 License: GPLv2+
 Source0: https://github.com/redhat-performance/%{name}/archive/v%{version}%{?prerel2}/%{name}-%{version}%{?prerel2}.tar.gz
@@ -96,7 +96,7 @@ Requires: python3-syspurpose
 # Revert upstream profiles changes which have not been approved for RHEL-8 (yet)
 Patch0: tuned-2.20.0-rhel-8-profiles.patch
 # Revert no balancing cores to use SD_LOAD_BALANCE (see rhbz#1874596 for details)
-Patch1: tuned-2.18.0-sd-load-balance.patch
+Patch1: tuned-2.21.0-sd-load-balance.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -410,6 +410,7 @@ fi
 %exclude %{_prefix}/lib/tuned/spindown-disk
 %exclude %{_prefix}/lib/tuned/sap-netweaver
 %exclude %{_prefix}/lib/tuned/sap-hana
+%exclude %{_prefix}/lib/tuned/sap-hana-kvm-guest
 %exclude %{_prefix}/lib/tuned/mssql
 %exclude %{_prefix}/lib/tuned/oracle
 %exclude %{_prefix}/lib/tuned/atomic-host
@@ -434,7 +435,6 @@ fi
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/post_loaded_profile
 %config(noreplace) %{_sysconfdir}/tuned/tuned-main.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/bootcmdline
-%{_sysconfdir}/dbus-1/system.d/com.redhat.tuned.conf
 %verify(not size mtime md5) %{_sysconfdir}/modprobe.d/tuned.conf
 %{_tmpfilesdir}/tuned.conf
 %{_unitdir}/tuned.service
@@ -446,6 +446,7 @@ fi
 %{_mandir}/man8/tuned*
 %dir %{_datadir}/tuned
 %{_datadir}/tuned/grub2
+%{_datadir}/dbus-1/system.d/com.redhat.tuned.conf
 %{_datadir}/polkit-1/actions/com.redhat.tuned.policy
 %ghost %{_sysconfdir}/modprobe.d/kvm.rt.tuned.conf
 %{_prefix}/lib/kernel/install.d/92-tuned.install
@@ -485,6 +486,7 @@ fi
 
 %files profiles-sap-hana
 %{_prefix}/lib/tuned/sap-hana
+%{_prefix}/lib/tuned/sap-hana-kvm-guest
 %{_mandir}/man7/tuned-profiles-sap-hana.7*
 
 %files profiles-mssql
@@ -550,6 +552,20 @@ fi
 %{_mandir}/man7/tuned-profiles-openshift.7*
 
 %changelog
+* Tue Aug 29 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21.0-1
+- new release
+  - api: fixed stop method not to require any parameter
+    resolves: rhbz#2235638
+
+* Sun Aug 20 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21.0-0.1.rc1
+- new release
+  - rebased tuned to latest upstream
+    resolves: rhbz#2182119
+  - sap-hana: new profile sap-hana-kvm-guest
+    resolves: rhbz#2173740
+  - serialized SIGHUP handler to prevent possible bootcmdline corruption
+    resolves: rhbz#2215298
+
 * Fri Feb 17 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2.20.0-1
 - new release
   - rebased tuned to latest upstream