diff --git a/tasks/main.yml b/tasks/main.yml
index 69c2b494c05fc87875f9e40bcf69821b0b90aba4..f41de8e6089a8061a5195c4350ab51e58f7c0f65 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,8 +1,10 @@
 ---
 
-- include: install.yml
-- include: test.yml
-- include: configure.yml
-- include: auth_json.yml
-- include: update.yml
-  when: composer_update == true
+- block:
+  - include: install.yml
+  - include: test.yml
+  - include: configure.yml
+  - include: auth_json.yml
+  - include: update.yml
+    when: composer_update == true
+  when: '"composer" not in excluded_roles'