diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml
index c2547050c..a8e3775a3 100644
--- a/roles/pbx/tasks/freepbx.yml
+++ b/roles/pbx/tasks/freepbx.yml
@@ -64,15 +64,37 @@
     group: www-data
     mode: 0644
 
-- name: FreePBX - Enable freepbx
+- name: FreePBX - Link freepbx.conf apache file to sites-enabled
   file: 
     src: /etc/apache2/sites-available/freepbx.conf
     dest: /etc/apache2/sites-enabled/freepbx.conf
     state: link
   when: pbx_enabled
 
-- name: FreePBX - Disable freepbx
+- name: FreePBX - Unlink freepbx.conf apachefile from sites-enabled
   file: 
     path: /etc/apache2/sites-enabled/freepbx.conf
     state: absent
   when: (not pbx_enabled)
+
+- name: FreePBX - Copy systemd unit file
+  template:
+    src: freepbx.service.j2
+    dest: /etc/systemd/system/freepbx.service
+    mode: 755
+
+- name: FreePBX - Enable and Start freepbx service
+  systemd:
+    daemon_reload: yes
+    name: freepbx
+    enabled: yes
+    state: started
+  when: pbx_enabled
+
+- name: FreePBX - Disable & Stop freepbx service
+  systemd:
+    daemon_reload: yes
+    name: freepbx
+    enabled: no
+    state: stopped
+  when: (not pbx_enabled)