diff --git a/roles/confluence/files/confluence.service b/roles/confluence/files/confluence.service
new file mode 100644
index 0000000..308e9a2
--- /dev/null
+++ b/roles/confluence/files/confluence.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Confluence
+After=network.target
+
+[Service]
+ExecStart=/bin/su confluence /opt/atlassian-confluence/bin/start-confluence.sh
+ExecStop=/bin/su confluence /opt/atlassian-confluence/bin/stop-confluence.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/confluence/handlers/main.yml b/roles/confluence/handlers/main.yml
index 44975c4..45a4168 100644
--- a/roles/confluence/handlers/main.yml
+++ b/roles/confluence/handlers/main.yml
@@ -2,3 +2,6 @@
 
 - name: Restart nginx
   service: name=nginx state=restarted
+
+- name: Reload systemd
+  command: systemctl daemon-reload
diff --git a/roles/confluence/tasks/main.yml b/roles/confluence/tasks/main.yml
index 8c4021b..4843889 100644
--- a/roles/confluence/tasks/main.yml
+++ b/roles/confluence/tasks/main.yml
@@ -6,6 +6,10 @@
   - postgresql
   - python-psycopg2
 
+- name: Install systemd unit
+  copy: src=confluence.service dest=/lib/systemd/system/confluence.service
+  notify: Reload systemd
+
 - name: Configure PostgreSQL database
   postgresql_db: name={{ confluence_dbname }}
   become: true
diff --git a/roles/respondd/tasks/main.yml b/roles/respondd/tasks/main.yml
index 5e5caad..b535deb 100644
--- a/roles/respondd/tasks/main.yml
+++ b/roles/respondd/tasks/main.yml
@@ -7,7 +7,7 @@
   git: repo={{ respondd_announce_git_root }} dest=/opt/{{ site_code }}/respondd-announce/ version={{ respondd_announce_git_version }}
   notify: Restart respondd
 
-- name: Install system unit
+- name: Install systemd unit
   template: src=respondd.service.j2 dest=/lib/systemd/system/respondd.service
   notify:
   - Reload systemd
diff --git a/roles/yanic/tasks/main.yml b/roles/yanic/tasks/main.yml
index 6c9b013..5c20b6c 100644
--- a/roles/yanic/tasks/main.yml
+++ b/roles/yanic/tasks/main.yml
@@ -21,7 +21,7 @@
     - "{{ yanic_meshviewer_path }}"
     - /var/lib/yanic
 
-- name: Install system unit
+- name: Install systemd unit
   copy: src=yanic.service dest=/lib/systemd/system/yanic.service
   notify:
     - Reload systemd