diff --git a/data/anbox.service.in b/data/anbox.service.in
index 933b4d1..7cdd14f 100644
--- a/data/anbox.service.in
+++ b/data/anbox.service.in
@@ -2,7 +2,11 @@
 Description=Anbox session manager
 
 [Service]
+Type=simple
 ExecStart=@SNAP_MOUNT_DIR@/anbox session-manager
+Restart=always
+StartLimitIntervalSec=3
+StartLimitBurst=1
 
 [Install]
 WantedBy=default.target
diff --git a/debian/control b/debian/control
index 8696f8e..9dfb528 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: https://github.com/anbox/anbox.git
 
 Package: anbox-common
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, dbus-user-session
 Description: Common files necessary for Anbox
  .
  This package contains necessary things which can't be shipped
diff --git a/debian/rules b/debian/rules
index b141034..85b38d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,9 @@ override_dh_install:
 	install -d $(CURDIR)/debian/tmp/etc/modules-load.d
 	install -m 0644 kernel/anbox.conf $(CURDIR)/debian/tmp/etc/modules-load.d
 
-	install -d $(CURDIR)/debian/tmp/usr/lib/systemd/user/
+	install -d $(CURDIR)/debian/tmp/usr/lib/systemd/user/default.target.wants
 	install -m 0644 data/anbox.service $(CURDIR)/debian/tmp/usr/lib/systemd/user/
+	ln -sf /usr/lib/systemd/user/anbox.service $(CURDIR)/debian/tmp/usr/lib/systemd/user/default.target.wants/anbox.service
 
 	install -d $(CURDIR)/debian/tmp/usr/share/upstart/sessions/
 	install -m 0644 data/anbox.conf $(CURDIR)/debian/tmp/usr/share/upstart/sessions/