diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index cb69ab6cf..f220254be 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,7 +1,7 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-base
-pkgver=69
+pkgver=70
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
@@ -251,6 +251,10 @@ openrc() {
 		alpine-conf
 		busybox-mdev-openrc
 		busybox-openrc
+		esystemd-sysusers
+		esystemd-sysusers-openrc
+		esystemd-tmpfiles
+		esystemd-tmpfiles-openrc
 		eudev
 		eudev-openrc
 		logbookd
diff --git a/main/postmarketos-base/postmarketos-base-openrc.post-install b/main/postmarketos-base/postmarketos-base-openrc.post-install
index 749624855..3f0b24d41 100644
--- a/main/postmarketos-base/postmarketos-base-openrc.post-install
+++ b/main/postmarketos-base/postmarketos-base-openrc.post-install
@@ -7,16 +7,16 @@ rc-update add udev-settle sysinit
 rc-update add udev-postmount default
 
 # Enable other OpenRC services
-for service in devfs dmesg; do
+for service in devfs dmesg systemd-sysusers systemd-tmpfiles-setup-dev-early systemd-tmpfiles-setup-dev; do
 	rc-update -q add $service sysinit
 done
-for service in hwclock modules sysctl hostname bootmisc logbookd tmpfs; do
+for service in bootmisc hostname hwclock logbookd modules sysctl systemd-tmpfiles-setup; do
 	rc-update -q add $service boot
 done
 for service in sshd swapfile local postmarketos-zram-swap; do
 	rc-update -q add $service default
 done
-for service in mount-ro killprocs savecache; do
+for service in killprocs mount-ro savecache systemd-tmpfiles-clean; do
 	rc-update -q add $service shutdown
 done
 
diff --git a/main/postmarketos-base/postmarketos-base-openrc.post-upgrade b/main/postmarketos-base/postmarketos-base-openrc.post-upgrade
index a15eda3a2..27f019bf5 100644
--- a/main/postmarketos-base/postmarketos-base-openrc.post-upgrade
+++ b/main/postmarketos-base/postmarketos-base-openrc.post-upgrade
@@ -56,5 +56,12 @@ rc-update -q add postmarketos-zram-swap default
 rc-update -qq del tmpfs default || true
 # To disable mounting /tmp as tmpfs, set tmpfs_size=0 in /etc/conf.d/tmpfs
 rc-update -q add tmpfs boot
+# sysusers.d and tmpfiles.d are hard dependencies of the rootfs and should
+# always be enabled, so forcing this on upgrade will not impact users
+rc-update -q add systemd-tmpfiles-setup boot
+rc-update -q add systemd-tmpfiles-clean shutdown
+rc-update -q add systemd-sysusers sysinit
+rc-update -q add systemd-tmpfiles-setup-dev-early sysinit
+rc-update -q add systemd-tmpfiles-setup-dev sysinit
 
 exit 0