diff --git a/debian/rules b/debian/rules
index cc9eb70220..cc1d6620fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with=systemd
 
 override_dh_install:
-	dh_systemd_enable gitlab-mailroom.service
-	dh_systemd_enable gitlab-unicorn.service
-	dh_systemd_enable gitlab-sidekiq.service
-	dh_systemd_enable gitlab-workhorse.service
-	dh_systemd_enable gitlab.target
-	dh_systemd_start gitlab.target
 	dh_install -XLICENSE
 	# Make sure we are installing all required files in debian/install
 	sh debian/upstream-file-count-check.sh
 	rm -rf debian/gitlab/usr/share/gitlab/tmp/*
 
 override_dh_installinit:
-	dh_installinit --no-start
+	dh_installinit --no-start -p gitlab --name=gitlab-sidekiq
+	dh_installinit --no-start -p gitlab --name=gitlab-unicorn
+	dh_installinit --no-start -p gitlab --name=gitlab-mailroom
+	dh_installinit --no-start -p gitlab --name=gitlab-workhorse
+	dh_installinit
+
+override_dh_systemd_start:
+	dh_systemd_start --no-start