diff --git a/tasks/main.yml b/tasks/main.yml
index fa6683108a30d16398d685893801687366861051..5f599ffed01ad2ef718549f025f337a50b380df2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,11 +11,10 @@
 
 - block:
 
-  - include: apache.yml
-    when: '"apache" not in excluded_roles and role_apache_completed is not defined'
+  - import_tasks: apache.yml
 
-  - name: 'Apache | Remember that this role had been run'
+  - name: 'Remember that this role had been run'
     set_fact: role_apache_completed=true
     tags: 'always'
 
-  when: '"apache" not in excluded_roles'
+  when: '"apache" not in excluded_roles and role_apache_completed is not defined'