diff --git a/tasks/main.yml b/tasks/main.yml
index 6ebbd286a20ddb553f09840c68a6ce4c50284be2..7529e4c90700e9307a504220821b5ce7d9454912 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,15 @@
 ---
 
 - block:
-  - import_tasks: install.yml
-  - import_tasks: test.yml
+  - include_tasks: install.yml
+    tags: 'always'
+  - include_tasks: test.yml
     tags: 'update'
-  - import_tasks: configure.yml
-  - import_tasks: auth_json.yml
-  - import_tasks: update.yml
+  - include_tasks: configure.yml
+    tags: 'always'
+  - include_tasks: auth_json.yml
+    tags: 'always'
+  - include_tasks: update.yml
     when: composer_update == true
     tags: 'update'
   when: '"composer" not in excluded_roles'