diff --git a/templates/etc-opt-telegraf-telegraf.conf.j2 b/templates/etc-opt-telegraf-telegraf.conf.j2
index 8c0599c..76ff9e2 100644
--- a/templates/etc-opt-telegraf-telegraf.conf.j2
+++ b/templates/etc-opt-telegraf-telegraf.conf.j2
@@ -9,7 +9,7 @@
 
 {% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
 {% for key, value in ec2_tags.tags.iteritems()%}
-   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
 {% endfor %}
 {% endif %}
 
@@ -68,4 +68,4 @@
 {% endif %}
 
 {% endfor %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/templates/telegraf.conf.j2 b/templates/telegraf.conf.j2
index aa2f985..ef4d59e 100644
--- a/templates/telegraf.conf.j2
+++ b/templates/telegraf.conf.j2
@@ -9,7 +9,7 @@
 
 {% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
 {% for key, value in ec2_tags.tags.items()%}
-   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
+   "{{telegraf_agent_aws_tags_prefix}}{{ key }}" = "{{ value }}"
 {% endfor %}
 {% endif %}