diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index ae4337ab6..760c55f3a 100644
--- a/extra-repos/systemd/systemd-services/APKBUILD
+++ b/extra-repos/systemd/systemd-services/APKBUILD
@@ -7,7 +7,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=57
+pkgver=58
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -46,6 +46,7 @@ subpackages="
 	kglobalacceld-systemd:_service
 	ksystemstats-systemd:_service
 	kwallet-pam-systemd:_service
+	localsearch-systemd:_service
 	lxc-systemd:_service
 	mce-systemd:_service
 	mmsd-tng-systemd:_service
@@ -141,6 +142,7 @@ _kded_sources="user/plasma-kded6.service" # From https://invent.kde.org/framewor
 _kglobalacceld_sources="user/plasma-kglobalaccel.service"
 _ksystemstats_sources="user/plasma-ksystemstats.service"
 _kwallet_pam_sources="user/plasma-kwallet-pam.service"
+_localsearch_sources="user/tracker-writeback.service user/tracker-control.service user/tracker-miner-fs.service"  # From https://gitlab.gnome.org/GNOME/localsearch
 _lxc_sources="system/lxc@.service"
 _mce_sources="system/mce.service" # From mce upstream
 _mmsd_tng_sources="user/mmsd-tng.service"
@@ -220,6 +222,7 @@ source="$(flatpath \
 	$_kglobalacceld_sources \
 	$_ksystemstats_sources \
 	$_kwallet_pam_sources \
+	$_localsearch_sources \
 	$_lxc_sources \
 	$_mce_sources \
 	$_mmsd_tng_sources \
@@ -395,6 +398,9 @@ acf21c4391ca62775491ba4d3b7c460b4163ef07abb195e152c98299a2d12779f3eb95f8cad0aeb3
 bccc419b13d39c59ef6bb765dde2bef70c621995bc53d74ccc9ad4aef92931ee74c3ee0b19a0dffb8c3f133b5b0d73f5f70df269dddf5f0ed1dba1cf31d7e141  user-plasma-ksystemstats.service
 a9358610c86fd3506e4cf02aea26e699d61268121ea3c16507b8f71446c16169a1c90c75faf126f2cf607c091e507f7e5822ea5fd8cc1f6e14f257c8007287a3  user-plasma-kwallet-pam.service
 ebd194aad645a836ba2b51bfcebd7f78a8ec703e62dd7a7e85343df4f7b60e99abfebd6de12e540e4be24e9079aee0b8ea450e5169ce9ee97e44d0b370013a07  user-plasma-polkit-agent.service
+49010e368981fdb8f36bdfe58ed6ee00615cbee696891ce02fae7b213b451d5dfe60a5c6e0065c6d3ab588ce38948f5bee1f03200daa4fe8e234e82b249a9e15  user-tracker-writeback.service
+53777d4ba1c35d7f00294675f61d3f0a0fa632a9abd6d428d9e159419e3ae43c6bb3c12f506dca0545db889a6642bfbaee5802fc637c6a84635e5f6814c79944  user-tracker-control.service
+c5ebba42808185df86d71a0eec6d4c2122c45ea1d27123f0c0b389849e09dd8a85bd174654f3c6cb6467bd0ddb5cf25f07266ac3cdf25b888be355d07086ffed  user-tracker-miner-fs.service
 f6fb4c890cbf72e344ca7a22e7f033fb4c32ce9f5edc27c03ccc5c21424d6a0ef871d79e8a89a502a707bdceb3bfbd7a5b3c8e16b1cd30e149bf2fdf8cccea9e  system-lxc@.service
 becb3bb17995f44b4021d05109130a00d0eba3d698eaf204a1f8d325741faa729d4ac7fedf0446b9468507a3b558a412ae9aa7f813bbb1f466395c86f66542fd  system-mce.service
 873b53592786a978659bda8d32de5ed9a9f163ca298c4f4112f10bf635a8170c4060cc15b57ff72b3afd50075cd1c5dbc10030f00b166e2540397da9e1c5e46b  user-mmsd-tng.service
diff --git a/extra-repos/systemd/systemd-services/user-tracker-control.service b/extra-repos/systemd/systemd-services/user-tracker-control.service
new file mode 100644
index 000000000..95b938d33
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-tracker-control.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Tracker Filesystem Indexing Proxy
+ConditionUser=!@system
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.Tracker3.Miner.Files.Control
+ExecStart=/usr/libexec/localsearch-control-3
+Restart=on-failure
+# Don't restart after tracker daemon -k (aka tracker-control -k)
+RestartPreventExitStatus=SIGKILL
+
diff --git a/extra-repos/systemd/systemd-services/user-tracker-miner-fs.service b/extra-repos/systemd/systemd-services/user-tracker-miner-fs.service
new file mode 100644
index 000000000..73e06c6bc
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-tracker-miner-fs.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Tracker file system data miner
+ConditionUser=!root
+ConditionUser=!gnome-initial-setup
+After=gnome-session.target
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.LocalSearch3
+ExecStart=/usr/libexec/localsearch-3
+Restart=on-failure
+# Don't restart after tracker daemon -k (aka tracker-control -k)
+RestartPreventExitStatus=SIGKILL
+Slice=background.slice
+
+[Install]
+WantedBy=gnome-session.target
+
diff --git a/extra-repos/systemd/systemd-services/user-tracker-writeback.service b/extra-repos/systemd/systemd-services/user-tracker-writeback.service
new file mode 100644
index 000000000..a2801ba9a
--- /dev/null
+++ b/extra-repos/systemd/systemd-services/user-tracker-writeback.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Tracker data writeback service
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.LocalSearch3.Writeback
+ExecStart=/usr/libexec/localsearch-writeback-3
+Restart=on-failure
+# Don't restart after tracker daemon -k (aka tracker-control -k)
+RestartPreventExitStatus=SIGKILL
+Slice=background.slice
+