diff --git a/tasks/main.yml b/tasks/main.yml
index e52ba7b0e1b51ba9d2805222c04ca94ef777dc1f..e85c391bacbfd784fb38e2db2b4fe1f11d1fe6e1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,31 +3,40 @@
 
 - name: "NetData Role"
   set_fact: role_netdata_started=true
-  tags: always
+  tags: 'always'
 
 - block:
 
-  - import_tasks: prepare.yml
+  - include_tasks: prepare.yml
+    tags: 'always'
 
-  - import_tasks: install.yml
+  - include_tasks: install.yml
+    tags: 'always'
 
-  - import_tasks: configure.yml
+  - include_tasks: configure.yml
+    tags: 'always'
 
-  - import_tasks: apache.yml
+  - include_tasks: apache.yml
     when: groups['webserver'] is defined and inventory_hostname in groups['webserver']
+    tags: 'always'
 
-  - import_tasks: elasticsearch.yml
+  - include_tasks: elasticsearch.yml
     when: groups['logserver'] is defined and inventory_hostname in groups['logserver']
+    tags: 'always'
 
-  - import_tasks: haproxy.yml
+  - include_tasks: haproxy.yml
     when: groups['proxyserver'] is defined and inventory_hostname in groups['proxyserver']
+    tags: 'always'
 
-  - import_tasks: mysql.yml
+  - include_tasks: mysql.yml
     when: groups['dbserver-mysql'] is defined and inventory_hostname in groups['dbserver-mysql']
+    tags: 'always'
 
-  - import_tasks: silent.yml
+  - include_tasks: silent.yml
+    tags: 'always'
 
-  - import_tasks: varnish.yml
+  - include_tasks: varnish.yml
     when: groups['varnishserver'] is defined and inventory_hostname in groups['varnishserver']
+    tags: 'always'
 
   when: '"netdata" not in excluded_roles'