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