diff --git a/tasks/main.yml b/tasks/main.yml
index 2ff914c..cde3169 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -14,14 +14,14 @@
     - "{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
     - "defaults.yml"
 
-- include: user.yml
+- import_tasks: user.yml
 
-- include: packages.yml
+- include_tasks: packages.yml
   when: monitored_packages_install != False
 
-- include: nrpe.yml
+- include_tasks: nrpe.yml
   when: monitored_by_nrpe == True
 
-- include: ssh.yml
+- include_tasks: ssh.yml
   when: monitored_by_ssh == True
 
diff --git a/tasks/ssh.yml b/tasks/ssh.yml
index 7d3f480..a6e142d 100644
--- a/tasks/ssh.yml
+++ b/tasks/ssh.yml
@@ -12,12 +12,13 @@
     user: "{{ monitored_user }}"
     key: "{{ lookup('file', item) }}"
     key_options: 'no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty{% if monitored_ssh_key_wrapper %},command="{{ monitored_ssh_key_wrapper }}"{% endif %}'
-  with_items: monitored_ssh_key_files
+  with_items: "{{ monitored_ssh_key_files }}"
 
 - name: Copy SSH wrapper
   copy:
     src: "{{ monitored_ssh_key_wrapper_src }}"
     path: "{{ monitored_ssh_key_wrapper }}"
     mode: 0755
-  when: monitored_ssh_key_wrapper_src
+    backup: yes
+  when: monitored_ssh_key_wrapper_src|default(null)