diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index b46757453..a2fc9d883 100644
--- a/extra-repos/systemd/systemd-services/APKBUILD
+++ b/extra-repos/systemd/systemd-services/APKBUILD
@@ -6,7 +6,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=22
+pkgver=23
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -14,7 +14,7 @@ arch="noarch"
 options="!check"
 license="BSD-3-Clause"
 
-# 2. Add a new entry to subpackes in the format
+# 2. Add a new entry to subpackages in the format
 #    <pkgname>-systemd:_service where pkgname is the name
 #    of the package this service file should be part of
 #    ALPHABETICAL ORDER!!!
@@ -46,9 +46,12 @@ subpackages="
 	qbootctl-systemd:_service
 	rmtfs-systemd:_service
 	rtkit-systemd:_service
+	sensorfw-systemd:_service
 	sleep-inhibitor-systemd:_service
 	tqftpserv-systemd:_service
 	udisks2-systemd:_service
+	waydroid-container-systemd:_service
+	waydroid-sensors-systemd:_service
 	wireplumber-systemd:_service
 	wpa_supplicant-systemd:_service
 	xdg-desktop-portal-systemd:_service
@@ -96,9 +99,12 @@ _q6voiced_sources="system/q6voiced.service"
 _qbootctl_sources="system/qbootctl.service"
 _rmtfs_sources="system/rmtfs.service"
 _rtkit_sources="system/rtkit-daemon.service"
+_sensorfw_sources="system/sensorfwd.service"
 _sleep_inhibitor_sources="system/sleep-inhibitor.service"
 _tqftpserv_sources="system/tqftpserv.service"
 _udisks2_sources="system/udisks2.service" # From https://github.com/storaged-project/udisks/blob/master/data/udisks2.service.in
+_waydroid_container_sources="system/waydroid-container.service"
+_waydroid_sensors_sources="system/waydroid-sensors.service"
 _wireplumber_sources="user/wireplumber.service"  # https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/master/src/systemd/user
 _wpa_supplicant_sources="system/wpa_supplicant.service"
 _xdg_desktop_portal_sources="
@@ -132,8 +138,8 @@ source="$(flatpath \
 	$_hexagonrpcd_sources \
 	$_iio_sensor_proxy_sources \
 	$_iwd_sources \
-	$_lxc_sources \
 	$_kded_sources \
+	$_lxc_sources \
 	$_mmsd_tng_sources \
 	$_modemmanager_sources \
 	$_nftables_sources \
@@ -147,9 +153,12 @@ source="$(flatpath \
 	$_qbootctl_sources \
 	$_rmtfs_sources \
 	$_rtkit_sources \
+	$_sensorfw_sources \
 	$_sleep_inhibitor_sources \
 	$_tqftpserv_sources \
 	$_udisks2_sources \
+	$_waydroid_container_sources \
+	$_waydroid_sensors_sources \
 	$_wireplumber_sources \
 	$_wpa_supplicant_sources \
 	$_xdg_desktop_portal_sources \
@@ -178,9 +187,12 @@ _q6voiced_system_presets="q6voiced.service"
 _qbootctl_system_presets="qbootctl.service"
 _rmtfs_system_presets="rmtfs.service"
 _rtkit_system_presets="rtkit-deamon.service"
+_sensorfw_system_presets="sensorfwd.service"
 _sleep_inhibitor_system_presets="sleep-inhibitor.service"
 _tqftpserv_system_presets="tqftpserv.service"
 _udisks2_system_presets="udisks2.service"
+_waydroid_system_presets="waydroid-container.service"
+_waydroid_sensors_system_presets="waydroid-sensors.service"
 _wireplumber_user_presets="wireplumber.service"
 _wpa_supplicant_system_presets="wpa_supplicant.service"
 _xdg_desktop_portal_user_presets="xdg-desktop-portal-rewrite-launchers.service"
@@ -258,9 +270,12 @@ e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925
 621189aa251655796795f4fa0cd79360bb67573e7327e545064eaadafc83cc7b382a405d6ba80662e0a4ece3876e4270e3563d859a6ba63b5e3854b39c35873e  system-qbootctl.service
 11bb0ff9ab32f0f230c665db2738e37e5226fa200621b9207baf92e0632a38f840395a55ef6e827763911cf78f3bad95cd3456e77cc01b30b8abce96dc13df9d  system-rmtfs.service
 1a0958e4fe232967946e9f2b17a13434b137236ba5d18442175d648b084d82df3a9fc5723c1621be899ee290b99777ac3c0ee6ad733e72d8e70f63b37ad00036  system-rtkit-daemon.service
+d5bf5f01c0feafab4edfc39b75eded608dc3efcd3b918739e3ed2ab11340c9cc9b6fb97c0706ddd3d49b726c5f62e8cdb0048aefafd916f3ad9defc6ff9783bc  system-sensorfwd.service
 be9df5e3fd9c88ec1a8db4aa2d9e8075d74ee3d2670aa3cfc611df3cff4d4041ac888a0338c9d5f134bbc69aa32eb52ac40eb3e0981813afa18389cba14d3818  system-sleep-inhibitor.service
 c569b27925297672c479e12a6425abdf5791886fff77c2c2b67b7aa9277eb0a22e7b95b52dbc225870c97460d0988a4dae18ed864e19096c704c0895de55b699  system-tqftpserv.service
 c7ea2b18c9d8f82306fbaca6d07b7019de3819d7898c3f50c3d0aceef4da4d311ed3bf31385e2f8998b8e3e326b1eb13309ffd44cf1b2d9db9b40bca00222c16  system-udisks2.service
+023fc89481f9079ac2d2d6b8a9ab212cb13a6b309caaa92b336df4c6ee9cff05538f035f8411fd8f6b87ca73b400172f56022edbf02d3776ab6f2aa7af2eebef  system-waydroid-container.service
+841caa793d256cacea7eb651f3d77039b1c0ddb22727100d6cca74230e528aee09e945e1fdf20eaf40abbe3eaec9210eb7fa27144dc906cab65f8078b36921f9  system-waydroid-sensors.service
 210a7610acfcaee642ac34abe80e77f492e7e2411a9226d26578675893a125b8333a26c2756cf4376745e32fb99a2b7851d737e4df3b2c7d923f730d8ae33e9d  user-wireplumber.service
 d55edea6983ad73b1817dfac3e6d418113c8e0fbd6cb2835dedcad2e5c76c8889c09348a184ed4ab38397d7d539831ef6a7ce08037e12c7ab6dc274519dc5812  system-wpa_supplicant.service
 9a3620d3df53540a91efa48df322288d96ec887415f538877a979be40eb5239b95917b9ac57fda2c699fe3f1c6500f7de09a4ce6625b0818f5786e125713552f  user-xdg-desktop-portal.service
diff --git a/extra-repos/systemd/systemd-services/system-sensorfwd.service b/extra-repos/systemd/systemd-services/system-sensorfwd.service
new file mode 100644
index 000000000..6e18549b1
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/system-sensorfwd.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Sensor daemon for sensor framework
+After=dbus.socket
+After=oneshot-root.service
+Requires=dbus.service
+Conflicts=actdead.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf --systemd --log-level=warning --no-magnetometer-bg-calibration
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+RestartSec=2
+# Sandboxing
+CapabilityBoundingSet=CAP_BLOCK_SUSPEND CAP_DAC_OVERRIDE CAP_FOWNER
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=full
+
+[Install]
+WantedBy=graphical.target
diff --git a/extra-repos/systemd/systemd-services/system-waydroid-container.service b/extra-repos/systemd/systemd-services/system-waydroid-container.service
new file mode 100644
index 000000000..4a863831d
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/system-waydroid-container.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Waydroid Container
+
+[Service]
+UMask=0022
+BusName=id.waydro.Container
+ExecStart=/usr/bin/waydroid -w container start
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra-repos/systemd/systemd-services/system-waydroid-sensors.service b/extra-repos/systemd/systemd-services/system-waydroid-sensors.service
new file mode 100644
index 000000000..34cfc67c0
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/system-waydroid-sensors.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Waydroid sensor daemon
+Requires=waydroid-container.service
+PartOf=waydroid-container.service
+After=waydroid-container.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/waydroid-sensord
+RestartSec=1
+TimeoutStartSec=5
+Restart=always
+
+[Install]
+WantedBy=multi-user.target