diff --git a/file_contexts.subs_dist b/file_contexts.subs_dist
index 97bd0be..7d7fca7 100644
--- a/file_contexts.subs_dist
+++ b/file_contexts.subs_dist
@@ -10,6 +10,8 @@
 /etc/systemd/system /usr/lib/systemd/system
 /run/systemd/system /usr/lib/systemd/system
 /run/systemd/generator /usr/lib/systemd/system
+/run/systemd/generator.early /usr/lib/systemd/system
+/run/systemd/generator.late /usr/lib/systemd/system
 /var/lib/xguest/home /home
 /var/run/netconfig /etc
 /var/adm/netconfig/md5/etc /etc
diff --git a/selinux-policy.changes b/selinux-policy.changes
index f5d31f3..a083cc1 100644
--- a/selinux-policy.changes
+++ b/selinux-policy.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Apr 15 13:23:40 UTC 2024 - Cathy Hu <cathy.hu@suse.com>
+
+- Add file contexts "forwarding" to file_contexts.sub_dist
+  to fix systemd-gpt-auto-generator and systemd-fstab-generator
+  (bsc#1222736):
+  * /run/systemd/generator.early /usr/lib/systemd/system
+  * /run/systemd/generator.late /usr/lib/systemd/system
+
 -------------------------------------------------------------------
 Thu Apr 11 15:13:31 UTC 2024 - cathy.hu@suse.com