diff --git a/fluentd/files/filter/_generate.conf b/fluentd/files/filter/_generate.conf
index 67c0c70..aaee7e9 100644
--- a/fluentd/files/filter/_generate.conf
+++ b/fluentd/files/filter/_generate.conf
@@ -1,6 +1,6 @@
 {%- for name, values in values.iteritems() %}
-# Filter {{ name }}
 {%- if values.get('enabled', True) %}
+# Filter {{ name }}
 {% include 'fluentd/files/filter/' + values.get('type') + '.conf' %}
 {%- endif %}
 {%- endfor %}
diff --git a/fluentd/files/input/_generate.conf b/fluentd/files/input/_generate.conf
index 91c1b52..17e6b13 100644
--- a/fluentd/files/input/_generate.conf
+++ b/fluentd/files/input/_generate.conf
@@ -1,6 +1,6 @@
 {%- for name, values in values.iteritems() %}
-# Input {{ name }}
 {%- if values.get('enabled', True) %}
+# Input {{ name }}
 {% include ['fluentd/files/input/' + values.get('type') + '.conf', 'fluentd/files/input/generic.conf'] %}
 {%- endif %}
-{%- endfor %}
\ No newline at end of file
+{%- endfor %}
diff --git a/fluentd/files/label.conf b/fluentd/files/label.conf
index 1285a18..e7a7377 100644
--- a/fluentd/files/label.conf
+++ b/fluentd/files/label.conf
@@ -1,3 +1,4 @@
+{%- if values.get('enabled', True) %}
 # Label {{ label_name }}
 {%- if values.get('input') %}
 {%- with values=values.get('input') %}
@@ -17,4 +18,5 @@
 {%- include 'fluentd/files/match/_generate.conf' %}
 {%- endwith %}
 {%- endif %}
-</label>
\ No newline at end of file
+</label>
+{%- endif %}
diff --git a/fluentd/files/match/_generate.conf b/fluentd/files/match/_generate.conf
index 3e9bc37..8cf9579 100644
--- a/fluentd/files/match/_generate.conf
+++ b/fluentd/files/match/_generate.conf
@@ -1,6 +1,6 @@
 {%- for name, values in values.iteritems() %}
-# Output {{ name }}
 {%- if values.get('enabled', True) %}
+# Output {{ name }}
 {% include 'fluentd/files/match/' + values.get('type') + '.conf' %}
 {%- endif %}
 {%- endfor %}