diff --git a/tasks/main.yml b/tasks/main.yml
index e85c391bacbfd784fb38e2db2b4fe1f11d1fe6e1..f152ff893ce8559be9aa98a2f8d08f4b7d379efe 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,36 +7,27 @@
 
 - block:
 
-  - include_tasks: prepare.yml
-    tags: 'always'
+  - include: prepare.yml
 
-  - include_tasks: install.yml
-    tags: 'always'
+  - include: install.yml
 
-  - include_tasks: configure.yml
-    tags: 'always'
+  - include: configure.yml
 
-  - include_tasks: apache.yml
+  - include: apache.yml
     when: groups['webserver'] is defined and inventory_hostname in groups['webserver']
-    tags: 'always'
 
-  - include_tasks: elasticsearch.yml
+  - include: elasticsearch.yml
     when: groups['logserver'] is defined and inventory_hostname in groups['logserver']
-    tags: 'always'
 
-  - include_tasks: haproxy.yml
+  - include: haproxy.yml
     when: groups['proxyserver'] is defined and inventory_hostname in groups['proxyserver']
-    tags: 'always'
 
-  - include_tasks: mysql.yml
+  - include: mysql.yml
     when: groups['dbserver-mysql'] is defined and inventory_hostname in groups['dbserver-mysql']
-    tags: 'always'
 
-  - include_tasks: silent.yml
-    tags: 'always'
+  - include: silent.yml
 
-  - include_tasks: varnish.yml
+  - include: varnish.yml
     when: groups['varnishserver'] is defined and inventory_hostname in groups['varnishserver']
-    tags: 'always'
 
   when: '"netdata" not in excluded_roles'