diff --git a/telegraf/agent.sls b/telegraf/agent.sls
index 9ac49d7..5f83274 100644
--- a/telegraf/agent.sls
+++ b/telegraf/agent.sls
@@ -16,6 +16,8 @@
     - template: jinja
     - require:
       - pkg: telegraf_packages_agent
+    - context:
+      agent: {{ agent }}
 
 {%- for name,values in agent.input.iteritems() %}
 
diff --git a/telegraf/files/telegraf.conf b/telegraf/files/telegraf.conf
index 8325c41..f1b051b 100644
--- a/telegraf/files/telegraf.conf
+++ b/telegraf/files/telegraf.conf
@@ -1,5 +1,3 @@
-{%- from "telegraf/map.jinja" import agent with context -%}
-
 [global_tags]
 
   {%- if agent.global_tags is defined %}
diff --git a/telegraf/remote_agent.sls b/telegraf/remote_agent.sls
index 3008ab9..5442d53 100644
--- a/telegraf/remote_agent.sls
+++ b/telegraf/remote_agent.sls
@@ -27,6 +27,8 @@
     - template: jinja
     - require:
       - file: config_dir_remote_agent
+    - context:
+      agent: {{ remote_agent }}
 
 {%- set remote_agent_inputs = {'input': {}} %}
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}