diff --git a/ELK/elasticHQ/defaults/main.yml b/ELK/elasticHQ/defaults/main.yml
index ff3a9506..948b90f8 100644
--- a/ELK/elasticHQ/defaults/main.yml
+++ b/ELK/elasticHQ/defaults/main.yml
@@ -9,4 +9,4 @@ elastic_hq_python_pkgs:
   - python3
   - python3-pip
 
-elastic_hq_start_cmd: './manage.py runserver'
+elastic_hq_start_cmd: '/usr/bin/python3 {{ elastic_hq_home }}/application.py'
diff --git a/ELK/elasticHQ/handlers/main.yml b/ELK/elasticHQ/handlers/main.yml
new file mode 100644
index 00000000..0b643045
--- /dev/null
+++ b/ELK/elasticHQ/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: systemd reload
+  command: systemctl daemon-reload
+
diff --git a/ELK/elasticHQ/tasks/main.yml b/ELK/elasticHQ/tasks/main.yml
index 4a4068b6..1790a90b 100644
--- a/ELK/elasticHQ/tasks/main.yml
+++ b/ELK/elasticHQ/tasks/main.yml
@@ -16,8 +16,20 @@
     - name: Get the elasticHQ distribution
       git: repo={{ elastic_hq_repo_url }} dest={{ elastic_hq_home }}
 
-    # - name: Get the elasticHQ dependencies
-    #   pip: chdir={{ elastic_hq_home }} executable=pip3 requirements=requirements.tx
+    - name: Get the elasticHQ dependencies
+      pip: chdir={{ elastic_hq_home }} executable=pip3 requirements=requirements.txt
+
+    - name: Install the elasticHQ systemd startup unit
+      template: src=elastichq.systemd.j2 dest=/etc/systemd/system/elastichq.service mode=0644 owner=root group=root
+      when: ansible_service_mgr == 'systemd'
+      register: elastichq_systemd_unit
+
+    - name: systemd reload
+      command: systemctl daemon-reload
+      when: elastichq_systemd_unit is changed
+
+    - name: Ensure that elasticHQ is started and enabled
+      service: name=elastichq state=started enabled=yes
 
   tags: [ 'elasticsearch', 'elastic_hq' ]
   
diff --git a/ELK/elasticHQ/templates/elastichq.systemd.j2 b/ELK/elasticHQ/templates/elastichq.systemd.j2
index 8dc4cfc9..287d776a 100644
--- a/ELK/elasticHQ/templates/elastichq.systemd.j2
+++ b/ELK/elasticHQ/templates/elastichq.systemd.j2
@@ -14,4 +14,5 @@ User={{ elastic_hq_user }}
 Group={{ elastic_hq_user }}
 
 ExecStart={{ elastic_hq_start_cmd }} 
+ExecStop=