diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index c2f1c7dcb93a811e4aa176a2c7b08ed55f158e19..599419c677696a22ef991d475ff2582c7ad72b8a 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -36,8 +36,7 @@
       state: present
     with_items: '{{ ec2.instance_ids }}'
 
-  - include_tasks: inithostip.yml hostip='{{ inithostip }}'
-    tags: 'always'
+  - import_tasks: inithostip.yml hostip='{{ inithostip }}'
 
   when: inithostip is defined
 
@@ -46,4 +45,3 @@
   loop_control:
     loop_var: ec2instance
   when: inithostip is not defined
-  tags: 'always'
diff --git a/tasks/inithost.yml b/tasks/inithost.yml
index f59433df7f1ca691558b6557ac6916491c4987a3..086e19746b559a92f811fb3ca3d868045142e94c 100644
--- a/tasks/inithost.yml
+++ b/tasks/inithost.yml
@@ -1,5 +1,4 @@
 ---
 # file: inithost.yml
 
-- include_tasks: "cleanup.yml"
-  tags: 'always'
+- import_tasks: "cleanup.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
index 1d80e5ed9427a60db2125fab788e9df82b303ec7..e1ad6e46bcb1f7dbccfc54aaaa90e8e0f383f2db 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,8 +7,8 @@
 
 - block:
 
-  - include: "{{ cloud|default('none') }}/{{ mode }}.yml"
+  - import_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
 
-  - include: "{{ mode }}.yml"
+  - import_tasks: "{{ mode }}.yml"
 
   when: '"cloud" not in excluded_roles'
diff --git a/tasks/removehost.yml b/tasks/removehost.yml
index 79eeebb4562aa67a9d8defd07ebab395b0d84713..bab081674680cf3323b96a3c53b1a3402464c8bd 100644
--- a/tasks/removehost.yml
+++ b/tasks/removehost.yml
@@ -1,6 +1,5 @@
 ---
 # file: removehost.yml
 
-- include_tasks: "cleanup.yml"
+- import_tasks: "cleanup.yml"
   when: are_you_sure == "YES"
-  tags: 'always'