diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index a204e2e1b..d21d1b181 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 (4 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=12
+pkgver=13
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -53,7 +53,13 @@ subpackages="
 #    to install for that package
 _apk_polkit_rs_sources="system/apk-polkit-server.service"
 _at_spi2_core_sources="user/at-spi-dbus-bus.service"
-_bluez_sources="system/bluetooth.service user/mpris-proxy.service"
+_bluez_sources="
+	system/bluetooth.service
+	system/bluetooth-mesh.service
+	user/dbus-org.bluez.obex.service
+	user/mpris-proxy.service
+	user/obex.service
+" # From bluez build with --enable-systemd
 _dconf_sources="user/dconf.service"
 _flatpak_sources="system/flatpak-system-helper.service user/flatpak-session-helper.service user/flatpak-portal.service"
 _geoclue_sources="system/geoclue.service" # From https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/master/data/geoclue.service.in
@@ -142,7 +148,10 @@ sha512sums="
 269dfc4748a9f1c4f49be8bab399d7412b6ff3b6d6ed9b3f2e31074b791789fb39aad450b4d43d318e7a070d1118ba79f216782b064cd106feac3eb4a8ca5581  system-apk-polkit-server.service
 12f5e008b0a41b3426b29f33556689ef88ba7184293ddb78fdaaf05cc4d029fd0b4c8fbef668aefed103a9f48c525f04a8e4e60ddc6e4329698aaf761b8e8f81  user-at-spi-dbus-bus.service
 de133c35cf95d7c833368c9010264668e72657400ad4e5259ef046321c878507f36ef73fa7b4759f69c9d18cda8f8db8d7675d794d9a28f46480fb4d47ba9e0c  system-bluetooth.service
+7972e37d950d8e337f109242dc3a7689d0d6e43b80ce42decd81f8d48abaf275a50f5d980d5a40d4494608a2f88f745e1d4639688e179c95792bfb6f398b9ae4  system-bluetooth-mesh.service
+5ad5f8adcc89759e5c935a2e55803fac52a9681af3a28f5c8d46f693717afcf7c8c6394f85dd5dbc1ddb575b909b0f6feee2e9973ee177e6445d375136b932ee  user-dbus-org.bluez.obex.service
 00049b418fab6dec7d9931a87cc64d2062efa0f7128bec1a693bfdf112703e628a2f1c98d2d5bf71554e6e576882890cef7a02de283909b1dd2f4c5ec0f6393e  user-mpris-proxy.service
+5ad5f8adcc89759e5c935a2e55803fac52a9681af3a28f5c8d46f693717afcf7c8c6394f85dd5dbc1ddb575b909b0f6feee2e9973ee177e6445d375136b932ee  user-obex.service
 e4de73d12abd046c8683e3be6e3aab40a5db3f5d6246cedbb3ff099bcc8037a167b23ac957d30f1118db571b69cb10c042272ac2b54dacf83fa6a3e9dad13a87  user-dconf.service
 0cfef56afeea103ca487b36f13665021bb349b8c890f023135a93c47d45cb58dd39ffe76212fb780546b1aaed8174e40345a961d7125f7d7ace5921e1dcc7ba9  system-flatpak-system-helper.service
 815a3072c211c85ff475ac7f2fb9c280b567b98777c0f7bf7fea4575b5eaa3b9a4003a08eb3b8cb5b2d7f9fb6525e04491e8d87013e2539ae3a574db647f97b1  user-flatpak-session-helper.service
diff --git a/extra-repos/systemd/systemd-services/system-bluetooth-mesh.service b/extra-repos/systemd/systemd-services/system-bluetooth-mesh.service
new file mode 100644
index 000000000..45efaf635
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/system-bluetooth-mesh.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Bluetooth mesh service
+ConditionPathIsDirectory=/sys/class/bluetooth
+
+[Service]
+Type=dbus
+BusName=org.bluez.mesh
+ExecStart=/usr/lib/bluetooth/bluetooth-meshd
+NotifyAccess=main
+LimitNPROC=1
+ProtectHome=true
+ProtectSystem=full
+Restart=on-failure
+RestartSec=5s
+
+[Install]
+WantedBy=bluetooth.target
+Alias=dbus-org.bluez.mesh.service
diff --git a/extra-repos/systemd/systemd-services/user-dbus-org.bluez.obex.service b/extra-repos/systemd/systemd-services/user-dbus-org.bluez.obex.service
new file mode 100644
index 000000000..f8d28140a
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-dbus-org.bluez.obex.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Bluetooth OBEX service
+
+[Service]
+Type=dbus
+BusName=org.bluez.obex
+ExecStart=/usr/lib/bluetooth/obexd
+
+[Install]
+Alias=dbus-org.bluez.obex.service
diff --git a/extra-repos/systemd/systemd-services/user-obex.service b/extra-repos/systemd/systemd-services/user-obex.service
new file mode 100644
index 000000000..f8d28140a
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-obex.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Bluetooth OBEX service
+
+[Service]
+Type=dbus
+BusName=org.bluez.obex
+ExecStart=/usr/lib/bluetooth/obexd
+
+[Install]
+Alias=dbus-org.bluez.obex.service