diff --git a/handlers/main.yml b/handlers/main.yml
index 6634dc4..9335ad6 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -31,11 +31,11 @@
     name: "haproxy"
     state: "restarted"
     enabled: yes
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
 
 - name: Restart rsyslog
   service:
     name: "rsyslog"
     state: "restarted"
     enabled: yes
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
diff --git a/tasks/haproxy_post_install.yml b/tasks/haproxy_post_install.yml
index a755bd6..48c25aa 100644
--- a/tasks/haproxy_post_install.yml
+++ b/tasks/haproxy_post_install.yml
@@ -39,6 +39,6 @@
   tags:
     - haproxy-logging-config
 
-- include: haproxy_service_config.yml
+- include_tasks: haproxy_service_config.yml
   tags:
     - haproxy-service-config
diff --git a/tasks/haproxy_ssl.yml b/tasks/haproxy_ssl.yml
index 28e69dc..9aec2e9 100644
--- a/tasks/haproxy_ssl.yml
+++ b/tasks/haproxy_ssl.yml
@@ -20,9 +20,9 @@
   tags:
     - haproxy-ssl
 
-- include: haproxy_ssl_self_signed.yml
+- include_tasks: haproxy_ssl_self_signed.yml
   when:
     - haproxy_ssl | bool
     - haproxy_user_ssl_cert is not defined or haproxy_user_ssl_key is not defined
 
-- include: haproxy_ssl_user_provided.yml
+- include_tasks: haproxy_ssl_user_provided.yml
diff --git a/tasks/haproxy_ssl_self_signed.yml b/tasks/haproxy_ssl_self_signed.yml
index d602e7f..a896be8 100644
--- a/tasks/haproxy_ssl_self_signed.yml
+++ b/tasks/haproxy_ssl_self_signed.yml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: haproxy_ssl_key_create.yml
+- include_tasks: haproxy_ssl_key_create.yml
   when: inventory_hostname == ansible_play_hosts[0]
 
-- include: haproxy_ssl_key_store.yml
+- include_tasks: haproxy_ssl_key_store.yml
   when: inventory_hostname == ansible_play_hosts[0]
 
-- include: haproxy_ssl_key_distribute.yml
+- include_tasks: haproxy_ssl_key_distribute.yml
   when: inventory_hostname != ansible_play_hosts[0]
diff --git a/tasks/main.yml b/tasks/main.yml
index 31ee6d1..9eb08b1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -23,19 +23,19 @@
   tags:
     - always
 
-- include: haproxy_pre_install.yml
+- include_tasks: haproxy_pre_install.yml
   tags:
     - haproxy_server-install
 
-- include: haproxy_install.yml
+- include_tasks: haproxy_install.yml
   tags:
     - haproxy_server-install
 
-- include: haproxy_ssl.yml
+- include_tasks: haproxy_ssl.yml
   when: haproxy_ssl | bool
   tags:
     - haproxy_server-config
 
-- include: haproxy_post_install.yml
+- include_tasks: haproxy_post_install.yml
   tags:
     - haproxy_server-config