diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index b5aaebc3c92bbc92f8bc62d39404e0575d448c20..40b8494898400bb371895a7a381b8c5a60e8e273 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -36,7 +36,7 @@
       state: present
     with_items: '{{ ec2.instance_ids }}'
 
-  - include_tasks: inithostip.yml hostip='{{ inithostip }}'
+  - import_tasks: inithostip.yml hostip='{{ inithostip }}'
 
   when: inithostip is defined
 
diff --git a/tasks/inithost.yml b/tasks/inithost.yml
index aef9aba510142bc78c567366efefe91d4989c580..086e19746b559a92f811fb3ca3d868045142e94c 100644
--- a/tasks/inithost.yml
+++ b/tasks/inithost.yml
@@ -1,4 +1,4 @@
 ---
 # file: inithost.yml
 
-- include_tasks: "cleanup.yml"
+- import_tasks: "cleanup.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
index a3236107e1233eeb19e893d755bb7fb04e0ed8e4..4c7791be5656fa86e7d88430379d6e68a1b57007 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,8 +7,8 @@
 
 - block:
 
-  - include_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
+  - import_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
 
-  - include_tasks: "{{ mode }}.yml"
+  - import_tasks: "{{ mode }}.yml"
 
   when: '"cloud" not in excluded_roles'
diff --git a/tasks/removehost.yml b/tasks/removehost.yml
index 6ca058867ed863e827109a08242f9bb6eb74b5fc..bab081674680cf3323b96a3c53b1a3402464c8bd 100644
--- a/tasks/removehost.yml
+++ b/tasks/removehost.yml
@@ -1,5 +1,5 @@
 ---
 # file: removehost.yml
 
-- include_tasks: "cleanup.yml"
+- import_tasks: "cleanup.yml"
   when: are_you_sure == "YES"