diff --git a/selinux-policy.spec b/selinux-policy.spec
index b215f67..96ac726 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -1,6 +1,6 @@
 # github repo with selinux-policy sources
 %global giturl https://github.com/fedora-selinux/selinux-policy
-%global commit 1f7f05d908f1c93939d7eed9f24a826b0f3ae723
+%global commit feb2379d4674d065dbcabe8b342c731954930536
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %define distro redhat
@@ -23,7 +23,7 @@
 %define CHECKPOLICYVER 3.2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 40.20
+Version: 40.21
 Release: 1%{?dist}
 License: GPL-2.0-or-later
 Source: %{giturl}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
@@ -871,6 +871,14 @@ exit 0
 %endif
 
 %changelog
+* Thu May 30 2024 Zdenek Pytela <zpytela@redhat.com> - 40.21-1
+- Add policy for a generic generator
+- Add policy for tpm2 generator
+- Add policy for ssh-generator
+- Add policy for second batch of generators
+- Update policy for systemd generators
+- ci: Adjust Cockpit test plans
+
 * Sun May 19 2024 Zdenek Pytela <zpytela@redhat.com> - 40.20-1
 - Allow journald read systemd config files and directories
 - Allow systemd_domain read systemd_conf_t dirs
diff --git a/sources b/sources
index d496d97..8ca1461 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (selinux-policy-1f7f05d.tar.gz) = 49bd67c54abb676ffe903cd2c118e3448b41446ff222a56c688a25ebcd01ebc9c5edefc23cdfcbc9fa53e8a75b3aa626c8269a94dab9de0265a1b5b0cf3e69c3
+SHA512 (selinux-policy-feb2379.tar.gz) = 77b627345e0b440b36f6eadee924a8412cea4709a9ab5b52304c2d8f57db6d98cb73f97ca78c4f948a6b6169624cb8511cdf688392921f5f3445ae8f6ce1d4a5
 SHA512 (macro-expander) = 243ee49f1185b78ac47e56ca9a3f3592f8975fab1a2401c0fcc7f88217be614fe31805bacec602b728e7fcfc21dcc17d90e9a54ce87f3a0c97624d9ad885aea4
-SHA512 (container-selinux.tgz) = 975a2e0d99b0a54f4570169b4e267ea2fcb5b2483d9f584aee31d0e78332a195d1419e8504fc1b198b09dce58eac910a1c0857fafff2c53af9851b79487d5376
+SHA512 (container-selinux.tgz) = f7a1a0dc146c688a6cfa4b8f62ce0e387c31c7e5260b2fe842a9e79d1bf96c9be0d4f2428abe1c19ed342d7e9010bc516e3590591b98df69cbe87be0a2002158