diff --git a/debian/conf/gitlab.target b/debian/conf/gitlab.target
index d022cc258d..acceaf73cb 100644
--- a/debian/conf/gitlab.target
+++ b/debian/conf/gitlab.target
@@ -8,7 +8,7 @@
 
 [Unit]
 Description=GitLab Service
-Requires=gitlab-unicorn.service gitlab-sidekiq.service gitlab-mailroom.service gitlab-workhorse.service
+Requires=gitlab-puma.service gitlab-sidekiq.service gitlab-mailroom.service gitlab-workhorse.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/gitlab.gitlab-mailroom.service b/debian/gitlab.gitlab-mailroom.service
index 50b53f8e4d..b29f5fafbc 100644
--- a/debian/gitlab.gitlab-mailroom.service
+++ b/debian/gitlab.gitlab-mailroom.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Gitlab mailroom Worker
 PartOf=gitlab.target
-Requires=gitlab-unicorn.service
-Wants=gitlab-unicorn.service
-After=gitlab-unicorn.service
+Requires=gitlab-puma.service
+Wants=gitlab-puma.service
+After=gitlab-puma.service
 PartOf=gitlab.service
-ReloadPropagatedFrom=gitlab-unicorn.service
+ReloadPropagatedFrom=gitlab-puma.service
 
 [Service]
 Type=simple
diff --git a/debian/gitlab.gitlab-puma.service b/debian/gitlab.gitlab-puma.service
index 4e8796f5b5..97d8ed8ab1 100644
--- a/debian/gitlab.gitlab-puma.service
+++ b/debian/gitlab.gitlab-puma.service
@@ -6,6 +6,7 @@ Wants=postgresql.service
 After=redis-server.service postgresql.service
 PartOf=gitlab.service
 ReloadPropagatedFrom=gitlab.service
+Conflicts=gitlab-unicorn.service
 
 [Service]
 Type=simple
diff --git a/debian/gitlab.gitlab-workhorse.service b/debian/gitlab.gitlab-workhorse.service
index e0ea038254..68f6f5a819 100644
--- a/debian/gitlab.gitlab-workhorse.service
+++ b/debian/gitlab.gitlab-workhorse.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Gitlab Workhorse handles slow HTTP requests for Gitlab.
 PartOf=gitlab.target
-Requires=gitlab-unicorn.service
-Wants=gitlab-unicorn.service
-After=gitlab-unicorn.service
+Requires=gitlab-puma.service
+Wants=gitlab-puma.service
+After=gitlab-puma.service
 PartOf=gitlab.service
-ReloadPropagatedFrom=gitlab-unicorn.service
+ReloadPropagatedFrom=gitlab-puma.service
 
 [Service]
 Type=simple
diff --git a/debian/gitlab.service b/debian/gitlab.service
index ade34f0a18..173ff87e8b 100644
--- a/debian/gitlab.service
+++ b/debian/gitlab.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=GitLab Services
 BindsTo=gitlab-puma.service gitlab-sidekiq.service gitlab-mailroom.service gitlab-workhorse.service
-After=gitlab-unicorn.service gitlab-sidekiq.service gitlab-mailroom.service gitlab-workhorse.service
+After=gitlab-puma.service gitlab-sidekiq.service gitlab-mailroom.service gitlab-workhorse.service
 
 [Service]
 Type=idle