diff --git a/config.sh b/config.sh
index 9b1b737..0224ddd 100644
--- a/config.sh
+++ b/config.sh
@@ -102,6 +102,14 @@ set -eux
 gawk -i inplace '$2 == "/home" { $4 = $4",x-systemd.growfs" } { print $0 }' /etc/fstab
 # workaround https://github.com/systemd/systemd/issues/927, drop the ro from the fstab mount
 gawk -i inplace '$2 == "/" && $4 == "compress=zstd:1,ro" { $4 = "compress=zstd:1" } { print $0 }' /etc/fstab
+
+# Relabel /etc. While kiwi already relabelled it earlier, there are some files created later (boo#1210604).
+# The "gawk -i inplace" above also removes the label on /etc/fstab.
+if [ -e /etc/selinux/config ]; then
+        . /etc/selinux/config
+        touch /etc/sysconfig/bootloader # Make sure this exists so it gets labelled
+        setfiles -e /proc -e /sys -e /dev /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts /etc
+fi
 EOF
 
 chmod a+x /etc/fstab.script
diff --git a/tik-osimage-Aeon.changes b/tik-osimage-Aeon.changes
index 367bc8f..c59d2c7 100644
--- a/tik-osimage-Aeon.changes
+++ b/tik-osimage-Aeon.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 7 17:12:23 UTC 2024 - Richard Brown <rbrown@suse.com>
+
+- Force relabeling of /etc as part of fstab.script
+
 -------------------------------------------------------------------
 Wed Jul 31 14:09:59 UTC 2024 - Richard Brown <rbrown@suse.com>