diff --git a/5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch b/5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch
deleted file mode 100644
index aedd52d9..00000000
--- a/5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 996b00ede87d6a870332e63974a7d4def3c2f1b0 Mon Sep 17 00:00:00 2001
-From: msizanoen <msizanoen@qtmlabs.xyz>
-Date: Mon, 12 Jun 2023 10:30:12 +0700
-Subject: [PATCH 5002/5002] Revert "core/service: when resetting PID also reset
- known flag"
-
-This reverts commit ff32060f2ed37b68dc26256b05e2e69013b0ecfe.
-
-This change is incorrect as we don't want to mark the PID as invalid but
-only mark it as dead.
-
-The change in question also breaks user level socket activation for
-`podman.service` as the termination of the main `podman system service`
-process is not properly handled, causing any application accessing the
-socket to hang.
-
-This is because the user-level `podman.service` unit also hosts two
-non-main processes: `rootlessport` and `rootlessport-child` which causes
-the `cgroup_good` check to still succeed.
-
-The original submitter of this commit is recommended to find another
-more correct way to fix the cgroupsv1 issue on CentOS 8.
----
- src/core/service.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/core/service.c b/src/core/service.c
-index 171e091dff..cecdd3bf50 100644
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -3752,7 +3752,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
-                         return;
- 
-                 s->main_pid = 0;
--                s->main_pid_known = false;
-                 exec_status_exit(&s->main_exec_status, &s->exec_context, pid, code, status);
- 
-                 if (s->main_command) {
--- 
-2.35.3
-
diff --git a/files.systemd b/files.systemd
index c49c7460..ec052ed4 100644
--- a/files.systemd
+++ b/files.systemd
@@ -3,9 +3,7 @@
 #
 %config(noreplace) %{_sysconfdir}/systemd/journald.conf
 %config(noreplace) %{_sysconfdir}/systemd/logind.conf
-%config(noreplace) %{_sysconfdir}/systemd/sleep.conf
 %config(noreplace) %{_sysconfdir}/systemd/system.conf
-%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
 %config(noreplace) %{_sysconfdir}/systemd/user.conf
 %dir %{_binfmtdir}
 %if %{without bootstrap}
@@ -48,7 +46,6 @@
 %dir %{_systemd_util_dir}/rpm
 %dir %{_systemd_util_dir}/system-preset
 %dir %{_systemd_util_dir}/system-shutdown
-%dir %{_systemd_util_dir}/system-sleep
 %dir %{_systemd_util_dir}/user
 %dir %{_systemd_util_dir}/user-generators
 %dir %{_systemd_util_dir}/user-preset
@@ -85,11 +82,9 @@
 %doc %{_tmpfilesdir}/README
 %exclude %{_sysconfdir}/sysctl.conf
 %ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id
-%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed
 %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
 %ghost %config(noreplace) %{_sysconfdir}/locale.conf
 %ghost %config(noreplace) %{_sysconfdir}/machine-info
-%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
 %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal
 %ghost %{_localstatedir}/lib/systemd/catalog/database
 %license LICENSE.GPL2
@@ -177,20 +172,17 @@
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
-%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
 %{_datadir}/pkgconfig/systemd.pc
 %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.timesync1.policy
 %{_datadir}/systemd/kbd-model-map
 %{_datadir}/systemd/language-fallback-map
 %if %{without bootstrap}
@@ -292,10 +284,8 @@
 %{_mandir}/man5/org.freedesktop.systemd1.5.gz
 %{_mandir}/man5/org.freedesktop.timedate1.5.gz
 %{_mandir}/man5/os-release.5.gz
-%{_mandir}/man5/sleep.conf.d.5.gz
 %{_mandir}/man5/sysctl.d.5.gz
 %{_mandir}/man5/system.conf.d.5.gz
-%{_mandir}/man5/systemd-sleep.conf.5.gz
 %{_mandir}/man5/systemd-system.conf.5.gz
 %{_mandir}/man5/systemd-user-runtime-dir.5.gz
 %{_mandir}/man5/systemd-user.conf.5.gz
@@ -321,13 +311,10 @@
 %{_mandir}/man5/systemd.timer.5.gz
 %{_mandir}/man5/systemd.unit.5.gz
 %{_mandir}/man5/sysusers.d.5.gz
-%{_mandir}/man5/timesyncd.conf.5.gz
-%{_mandir}/man5/timesyncd.conf.d.5.gz
 %{_mandir}/man5/tmpfiles.d.5.gz
 %{_mandir}/man5/user-runtime-dir@.service.5.gz
 %{_mandir}/man5/user.conf.d.5.gz
 %{_mandir}/man5/user@.service.5.gz
-%{_mandir}/man5/vconsole.conf.5.gz
 %{_mandir}/man7/bootup.7.gz
 %{_mandir}/man7/daemon.7.gz
 %{_mandir}/man7/file-hierarchy.7.gz
@@ -365,13 +352,8 @@
 %{_mandir}/man8/systemd-environment-d-generator.8.gz
 %{_mandir}/man8/systemd-getty-generator.8.gz
 %{_mandir}/man8/systemd-halt.service.8.gz
-%{_mandir}/man8/systemd-hibernate-resume-generator.8.gz
-%{_mandir}/man8/systemd-hibernate-resume.8.gz
-%{_mandir}/man8/systemd-hibernate-resume@.service.8.gz
-%{_mandir}/man8/systemd-hibernate.service.8.gz
 %{_mandir}/man8/systemd-hostnamed.8.gz
 %{_mandir}/man8/systemd-hostnamed.service.8.gz
-%{_mandir}/man8/systemd-hybrid-sleep.service.8.gz
 %{_mandir}/man8/systemd-journald-audit.socket.8.gz
 %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz
 %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz
@@ -386,21 +368,11 @@
 %{_mandir}/man8/systemd-logind.8.gz
 %{_mandir}/man8/systemd-logind.service.8.gz
 %{_mandir}/man8/systemd-machine-id-commit.service.8.gz
-%{_mandir}/man8/systemd-mkswap@.service.8.gz
 %{_mandir}/man8/systemd-poweroff.service.8.gz
-%{_mandir}/man8/systemd-quotacheck.8.gz
-%{_mandir}/man8/systemd-quotacheck.service.8.gz
-%{_mandir}/man8/systemd-random-seed.8.gz
-%{_mandir}/man8/systemd-random-seed.service.8.gz
 %{_mandir}/man8/systemd-reboot.service.8.gz
-%{_mandir}/man8/systemd-remount-fs.8.gz
-%{_mandir}/man8/systemd-remount-fs.service.8.gz
 %{_mandir}/man8/systemd-run-generator.8.gz
 %{_mandir}/man8/systemd-shutdown.8.gz
-%{_mandir}/man8/systemd-sleep.8.gz
 %{_mandir}/man8/systemd-socket-proxyd.8.gz
-%{_mandir}/man8/systemd-suspend-then-hibernate.service.8.gz
-%{_mandir}/man8/systemd-suspend.service.8.gz
 %{_mandir}/man8/systemd-sysctl.8.gz
 %{_mandir}/man8/systemd-sysctl.service.8.gz
 %{_mandir}/man8/systemd-sysext.8.gz
@@ -412,8 +384,6 @@
 %{_mandir}/man8/systemd-time-wait-sync.service.8.gz
 %{_mandir}/man8/systemd-timedated.8.gz
 %{_mandir}/man8/systemd-timedated.service.8.gz
-%{_mandir}/man8/systemd-timesyncd.8.gz
-%{_mandir}/man8/systemd-timesyncd.service.8.gz
 %{_mandir}/man8/systemd-tmpfiles-clean.service.8.gz
 %{_mandir}/man8/systemd-tmpfiles-clean.timer.8.gz
 %{_mandir}/man8/systemd-tmpfiles-setup.service.8.gz
@@ -424,8 +394,6 @@
 %{_mandir}/man8/systemd-update-utmp.service.8.gz
 %{_mandir}/man8/systemd-user-sessions.8.gz
 %{_mandir}/man8/systemd-user-sessions.service.8.gz
-%{_mandir}/man8/systemd-vconsole-setup.8.gz
-%{_mandir}/man8/systemd-vconsole-setup.service.8.gz
 %{_mandir}/man8/systemd-xdg-autostart-generator.8.gz
 %endif
 %{_modprobedir}/systemd.conf
@@ -439,37 +407,29 @@
 %{_sysconfdir}/xdg/systemd/user
 %{_sysctldir}/99-sysctl.conf
 %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator
-%{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list
 %{_systemd_util_dir}/rpm/fixlet-systemd-post.sh
 %{_systemd_util_dir}/system-preset/99-default.preset
 %{_systemd_util_dir}/systemd
 %{_systemd_util_dir}/systemd-binfmt
 %{_systemd_util_dir}/systemd-boot-check-no-failures
 %{_systemd_util_dir}/systemd-cgroups-agent
-%{_systemd_util_dir}/systemd-hibernate-resume
 %{_systemd_util_dir}/systemd-hostnamed
 %{_systemd_util_dir}/systemd-journald
 %{_systemd_util_dir}/systemd-localed
 %{_systemd_util_dir}/systemd-logind
-%{_systemd_util_dir}/systemd-quotacheck
-%{_systemd_util_dir}/systemd-random-seed
-%{_systemd_util_dir}/systemd-remount-fs
 %{_systemd_util_dir}/systemd-reply-password
 %{_systemd_util_dir}/systemd-shutdown
-%{_systemd_util_dir}/systemd-sleep
 %{_systemd_util_dir}/systemd-socket-proxyd
 %{_systemd_util_dir}/systemd-sulogin-shell
 %{_systemd_util_dir}/systemd-sysctl
 %{_systemd_util_dir}/systemd-sysroot-fstab-check
 %{_systemd_util_dir}/systemd-time-wait-sync
 %{_systemd_util_dir}/systemd-timedated
-%{_systemd_util_dir}/systemd-timesyncd
 %{_systemd_util_dir}/systemd-update-done
 %{_systemd_util_dir}/systemd-update-helper
 %{_systemd_util_dir}/systemd-update-utmp
 %{_systemd_util_dir}/systemd-user-runtime-dir
 %{_systemd_util_dir}/systemd-user-sessions
-%{_systemd_util_dir}/systemd-vconsole-setup
 %{_systemd_util_dir}/systemd-xdg-autostart-condition
 %{_systemd_util_dir}/user-generators/systemd-xdg-autostart-generator
 %{_systemd_util_dir}/user-preset/90-systemd.preset
@@ -497,11 +457,9 @@
 %{_systemd_util_dir}/user/xdg-desktop-autostart.target
 %{_systemdgeneratordir}/systemd-debug-generator
 %{_systemdgeneratordir}/systemd-getty-generator
-%{_systemdgeneratordir}/systemd-hibernate-resume-generator
 %{_systemdgeneratordir}/systemd-run-generator
 %{_systemdgeneratordir}/systemd-system-update-generator
 %{_sysusersdir}/systemd-journal.conf
-%{_sysusersdir}/systemd-timesync.conf
 %{_tmpfilesdir}/credstore.conf
 %{_tmpfilesdir}/journal-nocow.conf
 %{_tmpfilesdir}/provision.conf
@@ -542,8 +500,6 @@
 %{_unitdir}/getty@.service
 %{_unitdir}/graphical.target
 %{_unitdir}/halt.target
-%{_unitdir}/hibernate.target
-%{_unitdir}/hybrid-sleep.target
 %{_unitdir}/initrd-cleanup.service
 %{_unitdir}/initrd-fs.target
 %{_unitdir}/initrd-parse-etc.service
@@ -583,15 +539,12 @@
 %{_unitdir}/serial-getty@.service
 %{_unitdir}/shutdown.target
 %{_unitdir}/sigpwr.target
-%{_unitdir}/sleep.target
 %{_unitdir}/slices.target
 %{_unitdir}/smartcard.target
 %{_unitdir}/sockets.target
 %{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
 %{_unitdir}/sockets.target.wants/systemd-journald.socket
 %{_unitdir}/sound.target
-%{_unitdir}/suspend-then-hibernate.target
-%{_unitdir}/suspend.target
 %{_unitdir}/swap.target
 %{_unitdir}/sys-fs-fuse-connections.mount
 %{_unitdir}/sys-kernel-config.mount
@@ -612,7 +565,6 @@
 %{_unitdir}/sysinit.target.wants/systemd-journal-flush.service
 %{_unitdir}/sysinit.target.wants/systemd-journald.service
 %{_unitdir}/sysinit.target.wants/systemd-machine-id-commit.service
-%{_unitdir}/sysinit.target.wants/systemd-random-seed.service
 %{_unitdir}/sysinit.target.wants/systemd-sysctl.service
 %{_unitdir}/sysinit.target.wants/systemd-sysusers.service
 %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service
@@ -630,10 +582,7 @@
 %{_unitdir}/systemd-boot-check-no-failures.service
 %{_unitdir}/systemd-exit.service
 %{_unitdir}/systemd-halt.service
-%{_unitdir}/systemd-hibernate-resume@.service
-%{_unitdir}/systemd-hibernate.service
 %{_unitdir}/systemd-hostnamed.service
-%{_unitdir}/systemd-hybrid-sleep.service
 %{_unitdir}/systemd-journal-catalog-update.service
 %{_unitdir}/systemd-journal-flush.service
 %{_unitdir}/systemd-journald-audit.socket
@@ -648,25 +597,17 @@
 %{_unitdir}/systemd-logind.service
 %{_unitdir}/systemd-machine-id-commit.service
 %{_unitdir}/systemd-poweroff.service
-%{_unitdir}/systemd-quotacheck.service
-%{_unitdir}/systemd-random-seed.service
-%{_unitdir}/systemd-reboot.service
-%{_unitdir}/systemd-remount-fs.service
-%{_unitdir}/systemd-suspend-then-hibernate.service
-%{_unitdir}/systemd-suspend.service
 %{_unitdir}/systemd-sysctl.service
 %{_unitdir}/systemd-sysext.service
 %{_unitdir}/systemd-sysusers.service
 %{_unitdir}/systemd-time-wait-sync.service
 %{_unitdir}/systemd-timedated.service
-%{_unitdir}/systemd-timesyncd.service
 %{_unitdir}/systemd-tmpfiles-clean.service
 %{_unitdir}/systemd-tmpfiles-clean.timer
 %{_unitdir}/systemd-tmpfiles-setup.service
 %{_unitdir}/systemd-update-done.service
 %{_unitdir}/systemd-update-utmp.service
 %{_unitdir}/systemd-user-sessions.service
-%{_unitdir}/systemd-vconsole-setup.service
 %{_unitdir}/time-set.target
 %{_unitdir}/time-sync.target
 %{_unitdir}/timers.target
diff --git a/files.udev b/files.udev
index 6c8c3cc8..03e95f49 100644
--- a/files.udev
+++ b/files.udev
@@ -2,6 +2,8 @@
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
 %config(noreplace) %{_sysconfdir}/systemd/pstore.conf
+%config(noreplace) %{_sysconfdir}/systemd/sleep.conf
+%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
 %config(noreplace) %{_sysconfdir}/udev/udev.conf
 %if %{without bootstrap}
 %dir %{_libdir}/cryptsetup
@@ -17,12 +19,15 @@
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
 %dir %{_systemd_util_dir}/network
+%dir %{_systemd_util_dir}/system-sleep
 %dir %{_udevhwdbdir}
 %dir %{_udevrulesdir}
 %doc %{_udevhwdbdir}/README
 %doc %{_udevrulesdir}/README
+%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed
 %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin
 %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
+%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
 %ghost %{_localstatedir}/lib/systemd/backlight
 %if %{without bootstrap}
 %{_bindir}/kernel-install
@@ -35,7 +40,10 @@
 %{_datadir}/bash-completion/completions/systemd-cryptenroll
 %{_datadir}/bash-completion/completions/udevadm
 %endif
+%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
 %{_datadir}/pkgconfig/udev.pc
+%{_datadir}/polkit-1/actions/org.freedesktop.timesync1.policy
 %if %{without bootstrap}
 %{_datadir}/zsh/site-functions/_kernel-install
 %{_datadir}/zsh/site-functions/_udevadm
@@ -50,7 +58,12 @@
 %{_mandir}/man5/modules-load.d.5.gz
 %{_mandir}/man5/pstore.conf.5.gz
 %{_mandir}/man5/pstore.conf.d.5.gz
+%{_mandir}/man5/sleep.conf.d.5.gz
+%{_mandir}/man5/systemd-sleep.conf.5.gz
+%{_mandir}/man5/timesyncd.conf.5.gz
+%{_mandir}/man5/timesyncd.conf.d.5.gz
 %{_mandir}/man5/udev.conf.5.gz
+%{_mandir}/man5/vconsole.conf.5.gz
 %{_mandir}/man5/veritytab.5.gz
 %{_mandir}/man7/hwdb.7.gz
 %{_mandir}/man7/udev.7.gz
@@ -69,27 +82,46 @@
 %{_mandir}/man8/systemd-growfs-root.service.8.gz
 %{_mandir}/man8/systemd-growfs.8.gz
 %{_mandir}/man8/systemd-growfs@.service.8.gz
+%{_mandir}/man8/systemd-hibernate-resume-generator.8.gz
+%{_mandir}/man8/systemd-hibernate-resume.8.gz
+%{_mandir}/man8/systemd-hibernate-resume@.service.8.gz
+%{_mandir}/man8/systemd-hibernate.service.8.gz
 %{_mandir}/man8/systemd-hwdb.8.gz
+%{_mandir}/man8/systemd-hybrid-sleep.service.8.gz
 %{_mandir}/man8/systemd-integritysetup-generator.8.gz
 %{_mandir}/man8/systemd-integritysetup.8.gz
 %{_mandir}/man8/systemd-integritysetup@.service.8.gz
 %{_mandir}/man8/systemd-makefs.8.gz
 %{_mandir}/man8/systemd-makefs@.service.8.gz
+%{_mandir}/man8/systemd-mkswap@.service.8.gz
 %{_mandir}/man8/systemd-modules-load.8.gz
 %{_mandir}/man8/systemd-modules-load.service.8.gz
 %{_mandir}/man8/systemd-network-generator.8.gz
 %{_mandir}/man8/systemd-network-generator.service.8.gz
 %{_mandir}/man8/systemd-pstore.8.gz
 %{_mandir}/man8/systemd-pstore.service.8.gz
+%{_mandir}/man8/systemd-quotacheck.8.gz
+%{_mandir}/man8/systemd-quotacheck.service.8.gz
+%{_mandir}/man8/systemd-random-seed.8.gz
+%{_mandir}/man8/systemd-random-seed.service.8.gz
+%{_mandir}/man8/systemd-remount-fs.8.gz
+%{_mandir}/man8/systemd-remount-fs.service.8.gz
 %{_mandir}/man8/systemd-rfkill.8.gz
 %{_mandir}/man8/systemd-rfkill.service.8.gz
 %{_mandir}/man8/systemd-rfkill.socket.8.gz
+%{_mandir}/man8/systemd-sleep.8.gz
+%{_mandir}/man8/systemd-suspend-then-hibernate.service.8.gz
+%{_mandir}/man8/systemd-suspend.service.8.gz
+%{_mandir}/man8/systemd-timesyncd.8.gz
+%{_mandir}/man8/systemd-timesyncd.service.8.gz
 %{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz
 %{_mandir}/man8/systemd-udev-settle.service.8.gz
 %{_mandir}/man8/systemd-udevd-control.socket.8.gz
 %{_mandir}/man8/systemd-udevd-kernel.socket.8.gz
 %{_mandir}/man8/systemd-udevd.8.gz
 %{_mandir}/man8/systemd-udevd.service.8.gz
+%{_mandir}/man8/systemd-vconsole-setup.8.gz
+%{_mandir}/man8/systemd-vconsole-setup.service.8.gz
 %{_mandir}/man8/systemd-veritysetup-generator.8.gz
 %{_mandir}/man8/systemd-veritysetup.8.gz
 %{_mandir}/man8/systemd-veritysetup@.service.8.gz
@@ -112,12 +144,14 @@
 %{_prefix}/lib/udev/scsi_id
 %{_prefix}/lib/udev/v4l_id
 %{_systemd_util_dir}/network/99-default.link
+%{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list
 %{_systemd_util_dir}/systemd-backlight
 %if %{without bootstrap}
 %{_systemd_util_dir}/systemd-cryptsetup
 %endif
 %{_systemd_util_dir}/systemd-fsck
 %{_systemd_util_dir}/systemd-growfs
+%{_systemd_util_dir}/systemd-hibernate-resume
 %if %{without bootstrap}
 %{_systemd_util_dir}/systemd-integritysetup
 %endif
@@ -127,8 +161,14 @@
 %endif
 %{_systemd_util_dir}/systemd-network-generator
 %{_systemd_util_dir}/systemd-pstore
+%{_systemd_util_dir}/systemd-quotacheck
+%{_systemd_util_dir}/systemd-random-seed
+%{_systemd_util_dir}/systemd-remount-fs
 %{_systemd_util_dir}/systemd-rfkill
+%{_systemd_util_dir}/systemd-sleep
+%{_systemd_util_dir}/systemd-timesyncd
 %{_systemd_util_dir}/systemd-udevd
+%{_systemd_util_dir}/systemd-vconsole-setup
 %if %{without bootstrap}
 %{_systemd_util_dir}/systemd-veritysetup
 %endif
@@ -138,10 +178,12 @@
 %endif
 %{_systemdgeneratordir}/systemd-fstab-generator
 %{_systemdgeneratordir}/systemd-gpt-auto-generator
+%{_systemdgeneratordir}/systemd-hibernate-resume-generator
 %if %{without bootstrap}
 %{_systemdgeneratordir}/systemd-integritysetup-generator
 %{_systemdgeneratordir}/systemd-veritysetup-generator
 %endif
+%{_sysusersdir}/systemd-timesync.conf
 %{_tmpfilesdir}/static-nodes-permissions.conf
 %{_tmpfilesdir}/systemd-pstore.conf
 %{_udevhwdbdir}/20-OUI.hwdb
@@ -171,6 +213,7 @@
 %{_udevhwdbdir}/70-mouse.hwdb
 %{_udevhwdbdir}/70-pda.hwdb
 %{_udevhwdbdir}/70-pointingstick.hwdb
+%{_udevhwdbdir}/70-sound-card.hwdb
 %{_udevhwdbdir}/70-touchpad.hwdb
 %{_udevhwdbdir}/80-ieee1394-unit-function.hwdb
 %{_udevrulesdir}/50-udev-default.rules
@@ -210,6 +253,10 @@
 %if %{without bootstrap}
 %{_unitdir}/cryptsetup-pre.target
 %{_unitdir}/cryptsetup.target
+%endif
+%{_unitdir}/hibernate.target
+%{_unitdir}/hybrid-sleep.target
+%if %{without bootstrap}
 %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
 %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
 %endif
@@ -221,8 +268,11 @@
 %{_unitdir}/remote-cryptsetup.target
 %{_unitdir}/remote-veritysetup.target
 %endif
+%{_unitdir}/sleep.target
 %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket
 %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket
+%{_unitdir}/suspend-then-hibernate.target
+%{_unitdir}/suspend.target
 %if %{without bootstrap}
 %{_unitdir}/sysinit.target.wants/cryptsetup.target
 %{_unitdir}/sysinit.target.wants/integritysetup.target
@@ -232,6 +282,7 @@
 %if %{without bootstrap}
 %{_unitdir}/sysinit.target.wants/systemd-modules-load.service
 %endif
+%{_unitdir}/sysinit.target.wants/systemd-random-seed.service
 %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service
 %{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service
 %{_unitdir}/sysinit.target.wants/systemd-udevd.service
@@ -245,20 +296,31 @@
 %{_unitdir}/systemd-fsck@.service
 %{_unitdir}/systemd-growfs-root.service
 %{_unitdir}/systemd-growfs@.service
+%{_unitdir}/systemd-hibernate-resume@.service
+%{_unitdir}/systemd-hibernate.service
 %{_unitdir}/systemd-hwdb-update.service
+%{_unitdir}/systemd-hybrid-sleep.service
 %if %{without bootstrap}
 %{_unitdir}/systemd-modules-load.service
 %endif
 %{_unitdir}/systemd-network-generator.service
 %{_unitdir}/systemd-pstore.service
+%{_unitdir}/systemd-quotacheck.service
+%{_unitdir}/systemd-random-seed.service
+%{_unitdir}/systemd-reboot.service
+%{_unitdir}/systemd-remount-fs.service
 %{_unitdir}/systemd-rfkill.service
 %{_unitdir}/systemd-rfkill.socket
+%{_unitdir}/systemd-suspend-then-hibernate.service
+%{_unitdir}/systemd-suspend.service
+%{_unitdir}/systemd-timesyncd.service
 %{_unitdir}/systemd-tmpfiles-setup-dev.service
 %{_unitdir}/systemd-udev-settle.service
 %{_unitdir}/systemd-udev-trigger.service
 %{_unitdir}/systemd-udevd-control.socket
 %{_unitdir}/systemd-udevd-kernel.socket
 %{_unitdir}/systemd-udevd.service
+%{_unitdir}/systemd-vconsole-setup.service
 %{_unitdir}/systemd-volatile-root.service
 %if %{without bootstrap}
 %{_unitdir}/veritysetup-pre.target
diff --git a/systemd-v253.5+suse.29.g07bb12a282.tar.xz b/systemd-v253.5+suse.29.g07bb12a282.tar.xz
deleted file mode 100644
index f3a89298..00000000
--- a/systemd-v253.5+suse.29.g07bb12a282.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c46ef61c3b92f4a83c203bf5961c1d6ca50fddbd8d97c59060feae0f04dc24ee
-size 8218940
diff --git a/systemd-v253.7+suse.31.g2dac0aff9c.tar.xz b/systemd-v253.7+suse.31.g2dac0aff9c.tar.xz
new file mode 100644
index 00000000..49a57fdf
--- /dev/null
+++ b/systemd-v253.7+suse.31.g2dac0aff9c.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f47ae5f0e4f04e059091c9099e9e8ab1bc531fa18ee8fc40347b0ee6eee98eb6
+size 8279192
diff --git a/systemd.changes b/systemd.changes
index 3b59dd5a..2989c218 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Jul 18 08:54:44 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Import commit 2dac0aff9ced1eca0cd11c24e264b33095ee5a5e (merge of v253.7)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/6458c066547eaadf0e9709e441ea36ad03faa860...2dac0aff9ced1eca0cd11c24e264b33095ee5a5e
+
+-------------------------------------------------------------------
+Tue Jul 11 13:32:04 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Import commit 6458c066547eaadf0e9709e441ea36ad03faa860 (merge of v253.6)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/07bb12a282b0ea378850934c4a76008b448b8bad...6458c066547eaadf0e9709e441ea36ad03faa860
+
+- Drop 5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch, it's
+  been backported to v253.6.
+
+-------------------------------------------------------------------
+Tue Jul 11 12:56:59 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Move a bunch of files from systemd to udev. These are pretty useless without
+  block devices.
+
 -------------------------------------------------------------------
 Mon Jul  3 15:16:38 UTC 2023 - Franck Bui <fbui@suse.com>
 
@@ -811,6 +836,7 @@ Wed Jun  1 07:20:05 UTC 2022 - Franck Bui <fbui@suse.com>
   This includes the following bug fixes:
 
     - upstream commit e6b169418369abbc88c8f622e02e1d704a23d4ef (bsc#1137373 bsc#1181658 bsc#1194708 bsc#1195157 bsc#1197570)
+    - upstream commit 3a3b022d2cc112803ea7b9beea98bbcad110368a (bsc#1212434)
 
   * Rebased 0001-conf-parser-introduce-early-drop-ins.patch
 
diff --git a/systemd.spec b/systemd.spec
index 94de7e92..78a43905 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -19,7 +19,7 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 
 %define min_kernel_version 4.5
-%define archive_version +suse.29.g07bb12a282
+%define archive_version +suse.31.g2dac0aff9c
 
 %define _testsuitedir %{_systemd_util_dir}/tests
 %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@@ -73,7 +73,7 @@
 
 Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        253.5
+Version:        253.7
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later
@@ -214,7 +214,6 @@ Patch12:        0009-pid1-handle-console-specificities-weirdness-for-s390.patch
 # will be removed as soon as a proper fix will be merged by upstream.
 Patch5000:      5000-core-manager-run-generators-directly-when-we-are-in-.patch
 Patch5001:      5001-Revert-core-propagate-stop-too-if-restart-is-issued.patch
-Patch5002:      5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -1070,6 +1069,7 @@ fi
 %if %{without filetriggers}
 %udev_hwdb_update
 %tmpfiles_create systemd-pstore.conf
+%sysusers_create systemd-timesync.conf
 %endif
 %systemd_post remote-cryptsetup.target
 %systemd_post systemd-pstore.service