diff --git a/_servicedata b/_servicedata
index 43bebb1..2644f1f 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,5 +1,5 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/openSUSE/microos-tools.git</param>
-  <param name="changesrevision">a4b7e76665bf7391eeb415bba2722424c1c6db34</param></service>
+  <param name="changesrevision">b8cd65478095ed52d5e13e462d2807a7f895492b</param></service>
 </servicedata>
\ No newline at end of file
diff --git a/microos-tools-4.0+git2.obscpio b/microos-tools-4.0+git2.obscpio
deleted file mode 100644
index 02cde9c..0000000
--- a/microos-tools-4.0+git2.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d3b1d3ee7ed9d38a37f3f12da5975453804a6ce784af68cc3569cf30f701401
-size 61963
diff --git a/microos-tools-4.0+git6.obscpio b/microos-tools-4.0+git6.obscpio
new file mode 100644
index 0000000..27a98f0
--- /dev/null
+++ b/microos-tools-4.0+git6.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7fb8061d5bb46c7c4bed474fbb0c2f461ba4afbf5bd2d7b113d563d42bb62e7
+size 63499
diff --git a/microos-tools.changes b/microos-tools.changes
index babcb68..778fd94 100644
--- a/microos-tools.changes
+++ b/microos-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Nov 14 14:50:30 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 4.0+git6:
+  * test: Check for AVC denials in the journal
+  * test: More reliable output of combustion-validate
+  * test: Remove workaround for boo#1230912
+  * Label /sys before selinux-autorelabel units run (bsc#1232709)
+
 -------------------------------------------------------------------
 Tue Oct 29 15:55:08 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/microos-tools.obsinfo b/microos-tools.obsinfo
index 09803ad..cfd06c2 100644
--- a/microos-tools.obsinfo
+++ b/microos-tools.obsinfo
@@ -1,4 +1,4 @@
 name: microos-tools
-version: 4.0+git2
-mtime: 1730217232
-commit: a4b7e76665bf7391eeb415bba2722424c1c6db34
+version: 4.0+git6
+mtime: 1731595768
+commit: b8cd65478095ed52d5e13e462d2807a7f895492b
diff --git a/microos-tools.spec b/microos-tools.spec
index 2af2cdd..4bfe85b 100644
--- a/microos-tools.spec
+++ b/microos-tools.spec
@@ -19,7 +19,7 @@
 %{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
 
 Name:           microos-tools
-Version:        4.0+git2
+Version:        4.0+git6
 Release:        0
 Summary:        Files and Scripts for openSUSE MicroOS
 License:        GPL-2.0-or-later
@@ -90,11 +90,19 @@ This package contains tools to make developing of MicroOS easier.
 %postun -n microos-devel-tools
 %service_del_postun microos-ro.service
 
+%pre -n selinux-autorelabel
+%service_add_pre systemd-tmpfiles-setup-sys.service
+
 %post -n selinux-autorelabel
 %{regenerate_initrd_post}
+%service_add_post systemd-tmpfiles-setup-sys.service
+
+%preun -n selinux-autorelabel
+%service_del_preun systemd-tmpfiles-setup-sys.service
 
 %postun -n selinux-autorelabel
 %{regenerate_initrd_post}
+%service_del_postun systemd-tmpfiles-setup-sys.service
 
 %posttrans -n selinux-autorelabel
 %{regenerate_initrd_posttrans}
@@ -120,6 +128,7 @@ This package contains tools to make developing of MicroOS easier.
 %dir %{_prefix}/lib/dracut/modules.d
 %{_prefix}/lib/dracut/modules.d/98selinux-microos
 %{_systemdgeneratordir}/selinux-autorelabel-generator
+%{_unitdir}/systemd-tmpfiles-setup-sys.service
 
 %files -n microos-devel-tools
 %{_unitdir}/microos-ro.service