diff --git a/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml b/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml
index 4492505a..7675df81 100644
--- a/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml
@@ -70,6 +70,8 @@
     - Enable and restart apm server
 
 - include_tasks: apm_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml
index 3bc8858f..d02fc902 100644
--- a/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml
@@ -83,6 +83,8 @@
     - Enable and restart auditbeat
 
 - include_tasks: auditbeat_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml
index a73aae7f..bb2da298 100644
--- a/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml
@@ -193,6 +193,8 @@
     - Enable and restart filebeat
 
 - include_tasks: filebeat_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml
index 4903c5f0..7176e14e 100644
--- a/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml
@@ -89,6 +89,8 @@
     - Enable and restart heartbeat
 
 - include_tasks: heartbeat_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
index bc7241e8..19694767 100644
--- a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
@@ -131,6 +131,8 @@
             After: network-online.target
 
 - include_tasks: journalbeat_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
index 842cbb32..31399112 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
@@ -263,6 +263,8 @@
     - Enable and restart metricbeat
 
 - include_tasks: metricbeat_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml
index 6eb5f12a..e9c492c3 100644
--- a/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml
@@ -74,6 +74,8 @@
     - Enable and restart packetbeat
 
 - include_tasks: packetbeat_setup.yml
+  tags:
+    - setup
 
 - name: Force beat handlers
   meta: flush_handlers