diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2
index a027f0d5..ff089e95 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_shaping.conf.j2.j2
@@ -2,6 +2,13 @@
 [global_tags]
    device_id = "${device_id}"
    vsys_id = "{% raw %}{{ vsys_id }}{% endraw %}"
+{% raw %}{% for device_tag in device.tags %}
+{% for key,value in device_tag.items() %}
+   {{ key }} = "{{value}}"
+{% endfor %}
+{% endfor %}
+{% endraw %}
+
 [agent]
    interval = "1s"
    round_interval = true
diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
index 7e17b88c..90a5f687 100644
--- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
+++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2
@@ -1,6 +1,12 @@
 [global_tags]
    device_id = "${device_id}"
    vsys_id = "{% raw %}{{ vsys_id }}{% endraw %}"
+{% raw %}{% for device_tag in device.tags %}
+{% for key,value in device_tag.items() %}
+   {{ key }} = "{{value}}"
+{% endfor %}
+{% endfor %}
+{% endraw %}
 
 [agent]
    interval = "5s"