diff --git a/data/mapplauncherd.target b/data/mapplauncherd.target
deleted file mode 100644
index dce6fa3..0000000
--- a/data/mapplauncherd.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Application launch boosters
-Requires=pre-user-session.target
-After=pre-user-session.target
diff --git a/rpm/mapplauncherd.spec b/rpm/mapplauncherd.spec
index 85e7d5f..4bed8c1 100644
--- a/rpm/mapplauncherd.spec
+++ b/rpm/mapplauncherd.spec
@@ -105,9 +105,7 @@ mv %{buildroot}/usr/share/applauncherd-tests %{buildroot}/usr/lib
 rm -f %{buildroot}/usr/share/fala_images/fala_qml_helloworld
 
 mkdir -p %{buildroot}/usr/lib/systemd/user/user-session.target.wants || true
-ln -s ../mapplauncherd.target %{buildroot}/usr/lib/systemd/user/user-session.target.wants/
-mkdir -p %{buildroot}/usr/lib/systemd/user/mapplauncherd.target.wants || true
-ln -s ../booster-generic.service %{buildroot}/usr/lib/systemd/user/mapplauncherd.target.wants/
+ln -s ../booster-generic.service %{buildroot}/usr/lib/systemd/user/user-session.target.wants/
 # << install post
 
 %post -p /sbin/ldconfig
@@ -119,11 +117,9 @@ ln -s ../booster-generic.service %{buildroot}/usr/lib/systemd/user/mapplauncherd
 %{_bindir}/invoker
 %{_bindir}/single-instance
 %{_libdir}/libapplauncherd.so*
-%{_libdir}/systemd/user/mapplauncherd.target
 %{_libexecdir}/mapplauncherd/booster-generic
 %{_libdir}/systemd/user/booster-generic.service
-%{_libdir}/systemd/user/mapplauncherd.target.wants/booster-generic.service
-%{_libdir}/systemd/user/user-session.target.wants/mapplauncherd.target
+%{_libdir}/systemd/user/user-session.target.wants/booster-generic.service
 # >> files
 # << files
 
diff --git a/rpm/mapplauncherd.yaml b/rpm/mapplauncherd.yaml
index 29caf62..af6b36d 100644
--- a/rpm/mapplauncherd.yaml
+++ b/rpm/mapplauncherd.yaml
@@ -35,11 +35,9 @@ Files:
     - "%{_bindir}/invoker"
     - "%{_bindir}/single-instance"
     - "%{_libdir}/libapplauncherd.so*"
-    - "%{_libdir}/systemd/user/mapplauncherd.target"
     - "%{_libexecdir}/mapplauncherd/booster-generic"
     - "%{_libdir}/systemd/user/booster-generic.service"
-    - "%{_libdir}/systemd/user/mapplauncherd.target.wants/booster-generic.service"
-    - "%{_libdir}/systemd/user/user-session.target.wants/mapplauncherd.target"
+    - "%{_libdir}/systemd/user/user-session.target.wants/booster-generic.service"
 
 SubPackages:
     - Name: devel
diff --git a/src/booster-generic/booster-generic.service b/src/booster-generic/booster-generic.service
index 7581f42..32884e4 100644
--- a/src/booster-generic/booster-generic.service
+++ b/src/booster-generic/booster-generic.service
@@ -6,3 +6,6 @@ Requires=dbus.socket pre-user-session.target
 [Service]
 Type=notify
 ExecStart=/usr/libexec/mapplauncherd/booster-generic --systemd
+
+[Install]
+WantedBy=user-session.target