diff --git a/tasks/main.yml b/tasks/main.yml
index 0197dc876d48bc3c402257b8866b8fe0fc8f41ba..1d80e5ed9427a60db2125fab788e9df82b303ec7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,10 +7,8 @@
 
 - block:
 
-  - include_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
-    tags: 'always'
+  - include: "{{ cloud|default('none') }}/{{ mode }}.yml"
 
-  - include_tasks: "{{ mode }}.yml"
-    tags: 'always'
+  - include: "{{ mode }}.yml"
 
   when: '"cloud" not in excluded_roles'