diff --git a/Makefile b/Makefile
index e95dd1103..885a032e2 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,13 @@ endif
 SYSTEM_DROPINS_NETWORKING := NetworkManager.service NetworkManager-wait-online.service
 SYSTEM_DROPINS_NETWORKING += tinyproxy.service
 
-USER_DROPINS :=
+USER_DROPINS := \
+	tracker-xdg-portal-3.service \
+	tracker-writeback-3.service \
+	tracker-miner-rss-3.service \
+	tracker-miner-fs-control-3.service \
+	tracker-miner-fs-3.service \
+	tracker-extract-3.service
 
 # Ubuntu Dropins
 ifeq ($(release),Ubuntu)
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 078d7c350..9de31011a 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -103,6 +103,12 @@ lib/systemd/system/tor@default.service.d/30_qubes.conf
 lib/systemd/system/sysinit.target.requires
 lib/systemd/system/systemd-timesyncd.service.d/30_qubes.conf
 lib/systemd/system/systemd-logind.service.d/30_qubes.conf
+lib/systemd/user/tracker-extract-3.service.d/30_qubes.conf
+lib/systemd/user/tracker-miner-fs-3.service.d/30_qubes.conf
+lib/systemd/user/tracker-miner-fs-control-3.service.d/30_qubes.conf
+lib/systemd/user/tracker-miner-rss-3.service.d/30_qubes.conf
+lib/systemd/user/tracker-writeback-3.service.d/30_qubes.conf
+lib/systemd/user/tracker-xdg-portal-3.service.d/30_qubes.conf
 lib/udev/rules.d/50-qubes-mem-hotplug.rules
 usr/bin/qubes-desktop-run
 usr/bin/qubes-open
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 99ca6441b..769a746f8 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -1178,6 +1178,12 @@ The Qubes core startup configuration for SystemD init.
 %_unitdir/tor@default.service.d/30_qubes.conf
 %_unitdir/tmp.mount.d/30_qubes.conf
 %_unitdir/sysinit.target.requires/systemd-random-seed.service
+%_userunitdir/tracker-extract-3.service.d/30_qubes.conf
+%_userunitdir/tracker-miner-fs-3.service.d/30_qubes.conf
+%_userunitdir/tracker-miner-fs-control-3.service.d/30_qubes.conf
+%_userunitdir/tracker-miner-rss-3.service.d/30_qubes.conf
+%_userunitdir/tracker-writeback-3.service.d/30_qubes.conf
+%_userunitdir/tracker-xdg-portal-3.service.d/30_qubes.conf
 
 %post systemd
 
diff --git a/vm-systemd/user/tracker-extract-3.service.d/30_qubes.conf b/vm-systemd/user/tracker-extract-3.service.d/30_qubes.conf
new file mode 100644
index 000000000..4afb93669
--- /dev/null
+++ b/vm-systemd/user/tracker-extract-3.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/run/qubes-service/tracker
diff --git a/vm-systemd/user/tracker-miner-fs-3.service.d/30_qubes.conf b/vm-systemd/user/tracker-miner-fs-3.service.d/30_qubes.conf
new file mode 100644
index 000000000..4afb93669
--- /dev/null
+++ b/vm-systemd/user/tracker-miner-fs-3.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/run/qubes-service/tracker
diff --git a/vm-systemd/user/tracker-miner-fs-control-3.service.d/30_qubes.conf b/vm-systemd/user/tracker-miner-fs-control-3.service.d/30_qubes.conf
new file mode 100644
index 000000000..4afb93669
--- /dev/null
+++ b/vm-systemd/user/tracker-miner-fs-control-3.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/run/qubes-service/tracker
diff --git a/vm-systemd/user/tracker-miner-rss-3.service.d/30_qubes.conf b/vm-systemd/user/tracker-miner-rss-3.service.d/30_qubes.conf
new file mode 100644
index 000000000..4afb93669
--- /dev/null
+++ b/vm-systemd/user/tracker-miner-rss-3.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/run/qubes-service/tracker
diff --git a/vm-systemd/user/tracker-writeback-3.service.d/30_qubes.conf b/vm-systemd/user/tracker-writeback-3.service.d/30_qubes.conf
new file mode 100644
index 000000000..4afb93669
--- /dev/null
+++ b/vm-systemd/user/tracker-writeback-3.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/run/qubes-service/tracker
diff --git a/vm-systemd/user/tracker-xdg-portal-3.service.d/30_qubes.conf b/vm-systemd/user/tracker-xdg-portal-3.service.d/30_qubes.conf
new file mode 100644
index 000000000..4afb93669
--- /dev/null
+++ b/vm-systemd/user/tracker-xdg-portal-3.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/run/qubes-service/tracker