diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index 624bcdadd820bc1242c74c99b06f734091464df7..6d02e2e1cdf808e90d791a0c75db9215d47cf812 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -36,11 +36,11 @@
       state: present
     with_items: '{{ ec2.instance_ids }}'
 
-  - include: inithostip.yml hostip='{{ inithostip }}'
+  - include_tasks: inithostip.yml hostip='{{ inithostip }}'
 
   when: inithostip is defined
 
-- include: inithostip.yml hostip='{{ ec2instance.public_ip }}'
+- include_tasks: inithostip.yml hostip='{{ ec2instance.public_ip }}'
   with_items: '{{ ec2.instances }}'
   loop_control:
     loop_var: ec2instance
diff --git a/tasks/inithost.yml b/tasks/inithost.yml
index 7c6ddaca45a18cb11b2b2a7c5aa13af9348cc949..aef9aba510142bc78c567366efefe91d4989c580 100644
--- a/tasks/inithost.yml
+++ b/tasks/inithost.yml
@@ -1,4 +1,4 @@
 ---
 # file: inithost.yml
 
-- include: "cleanup.yml"
+- include_tasks: "cleanup.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
index e116fe96822f06eefa849db21b44ca4d2797eeda..a3236107e1233eeb19e893d755bb7fb04e0ed8e4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,8 +7,8 @@
 
 - block:
 
-  - include: "{{ cloud|default('none') }}/{{ mode }}.yml"
+  - include_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
 
-  - include: "{{ mode }}.yml"
+  - include_tasks: "{{ mode }}.yml"
 
   when: '"cloud" not in excluded_roles'
diff --git a/tasks/removehost.yml b/tasks/removehost.yml
index e0f71e6203fa00dcde0f68f9699d092ced0c3803..6ca058867ed863e827109a08242f9bb6eb74b5fc 100644
--- a/tasks/removehost.yml
+++ b/tasks/removehost.yml
@@ -1,5 +1,5 @@
 ---
 # file: removehost.yml
 
-- include: "cleanup.yml"
+- include_tasks: "cleanup.yml"
   when: are_you_sure == "YES"