diff --git a/elk_metrics_6x/installAPMserver.yml b/elk_metrics_6x/installAPMserver.yml
index 0220e795..8fd3bdc6 100644
--- a/elk_metrics_6x/installAPMserver.yml
+++ b/elk_metrics_6x/installAPMserver.yml
@@ -65,3 +65,5 @@
       until: templates | success
       retries: 3
       delay: 2
+  tags:
+    - beat-setup
diff --git a/elk_metrics_6x/installAuditbeat.yml b/elk_metrics_6x/installAuditbeat.yml
index 69359825..fff8646d 100644
--- a/elk_metrics_6x/installAuditbeat.yml
+++ b/elk_metrics_6x/installAuditbeat.yml
@@ -74,3 +74,5 @@
       until: templates | success
       retries: 3
       delay: 2
+  tags:
+    - beat-setup
diff --git a/elk_metrics_6x/installFilebeat.yml b/elk_metrics_6x/installFilebeat.yml
index c2dacdc9..8073356e 100644
--- a/elk_metrics_6x/installFilebeat.yml
+++ b/elk_metrics_6x/installFilebeat.yml
@@ -165,3 +165,5 @@
       until: templates | success
       retries: 3
       delay: 2
+  tags:
+    - beat-setup
diff --git a/elk_metrics_6x/installHeartbeat.yml b/elk_metrics_6x/installHeartbeat.yml
index cfef767a..dca05ba6 100644
--- a/elk_metrics_6x/installHeartbeat.yml
+++ b/elk_metrics_6x/installHeartbeat.yml
@@ -63,3 +63,5 @@
       until: templates | success
       retries: 3
       delay: 2
+  tags:
+    - beat-setup
diff --git a/elk_metrics_6x/installMetricbeat.yml b/elk_metrics_6x/installMetricbeat.yml
index d8710010..8b753f1f 100644
--- a/elk_metrics_6x/installMetricbeat.yml
+++ b/elk_metrics_6x/installMetricbeat.yml
@@ -90,3 +90,5 @@
       until: templates | success
       retries: 3
       delay: 2
+  tags:
+    - beat-setup
diff --git a/elk_metrics_6x/installPacketbeat.yml b/elk_metrics_6x/installPacketbeat.yml
index 9220480e..5981bb9b 100644
--- a/elk_metrics_6x/installPacketbeat.yml
+++ b/elk_metrics_6x/installPacketbeat.yml
@@ -66,3 +66,5 @@
       until: templates | success
       retries: 3
       delay: 2
+  tags:
+    - beat-setup