diff --git a/debian/gitlab.gitlab-unicorn.service b/debian/gitlab.gitlab-unicorn.service
deleted file mode 100644
index 139cb7586d..0000000000
--- a/debian/gitlab.gitlab-unicorn.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=GitLab Unicorn Server
-PartOf=gitlab.target
-Requires=redis-server.service
-Wants=postgresql.service
-After=redis-server.service postgresql.service
-PartOf=gitlab.service
-ReloadPropagatedFrom=gitlab.service
-
-[Service]
-Type=simple
-WorkingDirectory=/usr/share/gitlab
-EnvironmentFile=/etc/gitlab/gitlab-debian.conf
-EnvironmentFile=-/etc/default/gitlab
-SyslogIdentifier=gitlab-unicorn
-ExecStart=/usr/bin/bundle exec unicorn_rails -c config/unicorn.rb -E $RAILS_ENV
-ExecReload=/bin/kill -USR2 $MAINPID
-Restart=on-abnormal
-
-[Install]
-WantedBy=gitlab.target
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index 61dd2aea64..d8359a6219 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -260,7 +260,7 @@ case "$1" in
     fi
 
       # Override User for systemd services
-      for service in mailroom unicorn sidekiq workhorse; do
+      for service in mailroom puma sidekiq workhorse; do
         path=/etc/systemd/system/gitlab-${service}.service.d
         mkdir -p $path
         if [ -e $path/override.conf ]; then
diff --git a/debian/rules b/debian/rules
index 9c98ebd0ec..8b95810bd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_install:
 
 override_dh_installinit:
 	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-puma
 	dh_installinit --no-start -p gitlab --name=gitlab-mailroom
 	dh_installinit --no-start -p gitlab --name=gitlab-workhorse
 	dh_installinit