diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
index 10a80c86a..e5ebb9d6e 100644
--- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
+++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
@@ -2,7 +2,7 @@
 # Co-maintainer: Clayton Craft <clayton@craftyguy.net>
 # pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
 pkgname=postmarketos-base-systemd
-pkgver=28
+pkgver=29
 pkgrel=0
 pkgdesc="Meta package for running postmarketOS with systemd"
 url="https://postmarketos.org"
@@ -40,7 +40,9 @@ _source644="
 	etc/systemd/logind.conf
 	usr/share/mkinitfs/files-extra/01-initramfs-base-systemd.files
 	usr/lib/systemd/system-preset/90-base.preset
+	usr/lib/systemd/system/system.slice.d/10-oomd-defaults.conf
 	usr/lib/systemd/user-preset/90-base.preset
+	usr/lib/systemd/user/slice.d/10-oomd-defaults.conf
 "
 
 _source755="
@@ -73,7 +75,9 @@ sha512sums="
 fbaa33425e507062a454f11bda48508f261c2144e5c23a20f567dc1cef14ce1dec57f8d934f418f5b6095509757f8503481aba9790a04c8f9f6995e65833d8c9  rootfs-etc-profile.d-99motd.sh
 2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c  rootfs-etc-systemd-logind.conf
 15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1  rootfs-usr-share-mkinitfs-files-extra-01-initramfs-base-systemd.files
-9dd11b4b18712b50d93b4f7c6d7745c5da710707809d1fe6cc755ff943031f3fceae4ddef4be3aeff73051a8bbdc262d6b1307469f0fc21e0fcf1083ac309d7c  rootfs-usr-lib-systemd-system-preset-90-base.preset
+0a6c814bb23394ed9f358fa609b296629fe4277f06fba5960eb574b777bf437ce5f24eceb0e94b0003f87e2d7c028afc4c2a595441113359f923bf6bac255aa5  rootfs-usr-lib-systemd-system-preset-90-base.preset
+1458d526e3d68c052126f648a33c3f22af10e3a4d479dded824c2b18b2022b43232ea6f8c2061f051927b2d612750017a2ecf7e1a19680b71ca2dc112d5bd3f6  rootfs-usr-lib-systemd-system-system.slice.d-10-oomd-defaults.conf
 c7ec5a4e7c7dcbf855f34e80adb225f52221340099216e57792b04f07e7b367e004209551e9a74152d9212926aba1b1a0a2680d3c2e35f15cca6f3cf0c9a3841  rootfs-usr-lib-systemd-user-preset-90-base.preset
+1458d526e3d68c052126f648a33c3f22af10e3a4d479dded824c2b18b2022b43232ea6f8c2061f051927b2d612750017a2ecf7e1a19680b71ca2dc112d5bd3f6  rootfs-usr-lib-systemd-user-slice.d-10-oomd-defaults.conf
 605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd  rootfs-usr-bin-setup-timezone
 "
diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
index 08ba6e2e2..16038643e 100644
--- a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
+++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
@@ -27,6 +27,7 @@ enable tinydm.service
 enable udisks2.service
 enable cups.service
 enable zram_swap.service
+enable systemd-oomd.service
 
 # Note: technically these two shouldn't be enabled at the same time, but
 # pmos-base-wifi provides should make sure that only one is installed at the
diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-system.slice.d-10-oomd-defaults.conf b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-system.slice.d-10-oomd-defaults.conf
new file mode 100644
index 000000000..c300fbf1e
--- /dev/null
+++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-system.slice.d-10-oomd-defaults.conf
@@ -0,0 +1,4 @@
+[Slice]
+ManagedOOMSwap=kill
+ManagedOOMMemoryPressure=kill
+ManagedOOMMemoryPressureLimit=80%
diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-slice.d-10-oomd-defaults.conf b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-slice.d-10-oomd-defaults.conf
new file mode 100644
index 000000000..c300fbf1e
--- /dev/null
+++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-slice.d-10-oomd-defaults.conf
@@ -0,0 +1,4 @@
+[Slice]
+ManagedOOMSwap=kill
+ManagedOOMMemoryPressure=kill
+ManagedOOMMemoryPressureLimit=80%