diff --git a/roles/distgit/pagure/files/pagure_ev.service b/roles/distgit/pagure/files/pagure_ev.service
new file mode 100644
index 0000000000..93fc67745d
--- /dev/null
+++ b/roles/distgit/pagure/files/pagure_ev.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Pagure EventSource server (Allowing live refresh of the pages supporting it)
+After=redis.target
+Documentation=https://pagure.io/pagure
+
+[Service]
+ExecStart=/usr/libexec/pagure-ev/pagure_stream_server.py
+Type=simple
+User=pagure
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/distgit/pagure/files/pagure_logcom.service b/roles/distgit/pagure/files/pagure_logcom.service
new file mode 100644
index 0000000000..ae6ad689eb
--- /dev/null
+++ b/roles/distgit/pagure/files/pagure_logcom.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Pagure Logging Commit service
+After=redis.target
+Documentation=https://pagure.io/pagure
+
+[Service]
+ExecStart=/usr/libexec/pagure-logcom/pagure_logcom_server.py
+Type=simple
+User=pagure
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/distgit/pagure/files/pagure_webhook.service b/roles/distgit/pagure/files/pagure_webhook.service
new file mode 100644
index 0000000000..cc336dcff3
--- /dev/null
+++ b/roles/distgit/pagure/files/pagure_webhook.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Pagure WebHook server (Allowing web-hook notifications)
+After=redis.target
+Documentation=https://pagure.io/pagure
+
+[Service]
+ExecStart=/usr/libexec/pagure-webhook/pagure-webhook-server.py
+Type=simple
+User=pagure
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/distgit/pagure/files/pagure_worker.service b/roles/distgit/pagure/files/pagure_worker.service
index 7b9473b9cf..cd41fb3eff 100644
--- a/roles/distgit/pagure/files/pagure_worker.service
+++ b/roles/distgit/pagure/files/pagure_worker.service
@@ -8,7 +8,6 @@ ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info --autoreloa
 Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg"
 Type=simple
 User=pagure
-#Group=pagure
 Restart=on-failure
 
 [Install]
diff --git a/roles/distgit/pagure/tasks/main.yml b/roles/distgit/pagure/tasks/main.yml
index c91f43f924..a7445f3843 100644
--- a/roles/distgit/pagure/tasks/main.yml
+++ b/roles/distgit/pagure/tasks/main.yml
@@ -139,9 +139,14 @@
   - pagure
 
 - name: Override the default pagure_worker.service file to change the user it is run under
-  copy: src=pagure_worker.service
-        dest=/etc/systemd/system/pagure_worker.service
+  copy: src={{ item }}.service
+        dest=/etc/systemd/system/{{ item }}.service
         owner=root group=root mode=0755
+  with_items:
+  - pagure_ev
+  - pagure_logcom
+  - pagure_webhook
+  - pagure_worker
   notify:
   - reload systemd
   tags:
@@ -174,10 +179,10 @@
   - httpd
   - postfix
 #  - stunnel
-  - pagure_milter
   - redis
   - pagure_ev
   - pagure_logcom
+  - pagure_milter
   - pagure_webhook
   - pagure_worker
   - fedmsg-relay