diff --git a/fluentd/map.jinja b/fluentd/map.jinja
index 4b8ab10..b48aae7 100644
--- a/fluentd/map.jinja
+++ b/fluentd/map.jinja
@@ -1,4 +1,4 @@
-{% set fluentd_agent = salt['grains.filter_by']({
+{% set agent = salt['grains.filter_by']({
   'Debian': {
     'user': 'root',
     'group': 'root',
@@ -28,5 +28,6 @@
   {%- endif %}
 {%- endfor %}
 
+{%- set fluentd_agent = fluentd_grains.get('agent', {}) %}
 {# Deep-merge the service configuration with the pillar data #}
-{%- do salt['defaults.merge'](fluentd_agent, fluentd_grains.get('agent', {})) %}
+{%- do salt['defaults.merge'](fluentd_agent, agent) %}