diff --git a/tasks/mailer.yml b/tasks/mailer.yml
index f74d4fc..49c8268 100644
--- a/tasks/mailer.yml
+++ b/tasks/mailer.yml
@@ -9,5 +9,5 @@
     - newaliases
     - restart mailer
 
-- include_tasks: "{{ common_mailer_mailer }}.yml"
+- import_tasks: "{{ common_mailer_mailer }}.yml"
   when: common_mailer_mailer != False
diff --git a/tasks/main.yml b/tasks/main.yml
index e632ef3..e7ba1fd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,17 +1,17 @@
 ---
-- include_tasks: resolvconf.yml
+- import_tasks: resolvconf.yml
   when: common_resolvconf
   tags: ['common', 'resolvconf']
 
-- include_tasks: hostname.yml
+- import_tasks: hostname.yml
   when: common_hostname
   tags: ['common', 'hostname']
 
-- include_tasks: apt.yml
+- import_tasks: apt.yml
   when: common_apt
   tags: ['common', 'apt']
 
-- include_tasks: locales.yml
+- import_tasks: locales.yml
   when: common_locales
   tags: ['common', 'locales']
 
@@ -25,26 +25,26 @@
   with_items: "{{ common_scripts }}"
   tags: common
 
-- include_tasks: mailer.yml
+- import_tasks: mailer.yml
   when: common_mailer
   tags: ['common', 'mailer']
 
-- include_tasks: ntp.yml
+- import_tasks: ntp.yml
   when: common_ntp
   tags: ['common', 'ntp']
 
-- include_tasks: openssh.yml
+- import_tasks: openssh.yml
   when: common_openssh
   tags: ['common', 'openssh']
 
-- include_tasks: rsyslog.yml
+- import_tasks: rsyslog.yml
   when: common_rsyslog
   tags: ['common', 'rsyslog']
 
-- include_tasks: rcfiles.yml
+- import_tasks: rcfiles.yml
   when: common_rcfiles
   tags: ['common', 'rcfiles']
 
-- include_tasks: tty.yml
+- import_tasks: tty.yml
   when: common_tty
   tags: ['common', 'tty']