diff --git a/postfix/config.sls b/postfix/config.sls
index 0215705..94a1405 100644
--- a/postfix/config.sls
+++ b/postfix/config.sls
@@ -21,6 +21,8 @@ include:
     - watch_in:
       - service: postfix
     - template: jinja
+    - context:
+        postfix: {{ postfix|tojson }}
 
 {% if 'vmail' in pillar.get('postfix', '') %}
 {{ postfix.config_path }}/virtual_alias_maps.cf:
@@ -61,6 +63,7 @@ include:
 {% endif %}
 
 {% if salt['pillar.get']('postfix:manage_master_config', True) %}
+{% import_yaml "postfix/services.yaml" as postfix_master_services %}
 {{ postfix.config_path }}/master.cf:
   file.managed:
     - source: salt://postfix/files/master.cf
@@ -72,6 +75,9 @@ include:
     - watch_in:
       - service: postfix
     - template: jinja
+    - context:
+        postfix: {{ postfix|tojson }}
+        postfix_master_services: {{ postfix_master_services|tojson }}
 {% endif %}
 
 {% if 'transport' in pillar.get('postfix', '') %}
diff --git a/postfix/files/main.cf b/postfix/files/main.cf
index 9fbd6ef..ae9d35b 100644
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@@ -1,4 +1,3 @@
-{%- from "postfix/map.jinja" import postfix with context -%}
 {%- set config = salt['pillar.get']('postfix:config', {}) -%}
 
 {#- " | list": Python3.6 retuns dict_keys here, which needs to be converted into a list here. -#}
diff --git a/postfix/files/master.cf b/postfix/files/master.cf
index 85ccd33..eb81cb5 100644
--- a/postfix/files/master.cf
+++ b/postfix/files/master.cf
@@ -1,7 +1,4 @@
-{%- from "postfix/map.jinja" import postfix with context -%}
 {%- set master_config = salt['pillar.get']('postfix:master_config', {}) -%}
-{% import_yaml "postfix/services.yaml" as postfix_master_services %}
-
 {#-
  # Handle the case that the pillar data does not provide any service
  # configuration but submission parameters are provided in the pillar.