diff --git a/handlers/main.yml b/handlers/main.yml
index ee44206..ac960ef 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,10 @@
+- name: reload systemd configuration
+  command: systemctl daemon-reload
 
+# Restart service and ensure it is enabled
 - name: restart elasticsearch
   service: name={{instance_init_script | basename}} state=restarted enabled=yes
-  when: es_restart_on_change and es_start_service and not elasticsearch_started.changed and ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))
+  when: es_restart_on_change and es_start_service and ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))
 
 - name: load-native-realms
   include: ./handlers/shield/elasticsearch-shield-native.yml
diff --git a/tasks/elasticsearch-config.yml b/tasks/elasticsearch-config.yml
index 278f094..14ec741 100644
--- a/tasks/elasticsearch-config.yml
+++ b/tasks/elasticsearch-config.yml
@@ -43,7 +43,9 @@
 - name: Copy Systemd File for Instance
   template: src=systemd/elasticsearch.j2 dest={{instance_sysd_script}} mode=0644 force=yes
   when: use_system_d
-  notify: restart elasticsearch
+  notify:
+  - reload systemd configuration
+  - restart elasticsearch
 
 #Copy the logging.yml
 - name: Copy Logging.yml File for Instance
@@ -64,7 +66,7 @@
   when: ansible_os_family == 'RedHat'
 
 - name: Delete Default Sysconfig File
-  file: dest=/usr/lib/systemd/system/elasticsearch.service state=absent
+  file: dest="{{ sysd_script }}" state=absent
 
 - name: Delete Default Configuration File
   file: dest=/etc/elasticsearch/elasticsearch.yml state=absent
diff --git a/tasks/elasticsearch-service.yml b/tasks/elasticsearch-service.yml
deleted file mode 100644
index 57a79af..0000000
--- a/tasks/elasticsearch-service.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Make sure the service is started, and restart if necessary
-- name: Start elasticsearch service
-  service: name={{instance_init_script | basename}} state=started enabled=yes
-  when: es_start_service
-  register: elasticsearch_started
-
diff --git a/tasks/main.yml b/tasks/main.yml
index cd2743b..ebf67b3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -31,9 +31,6 @@
 - include: xpack/elasticsearch-xpack.yml
   tags:
       - xpack
-- include: elasticsearch-service.yml
-  tags:
-      - service
 - include: elasticsearch-templates.yml
   when: es_templates
   tags: