diff --git a/salt/map.jinja b/salt/map.jinja
index c1e8e1a..e0bfc10 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -8,10 +8,10 @@
   {%- elif pillar.salt.master.source.engine == 'pip' %}
   install_state: "pip: salt_master_packages"
   {%- endif %}
-  {%- endif %}
   {%- if pillar.salt.master.source.version is defined %}
   version: {{ pillar.salt.master.source.version }}
   {%- endif %}
+  {%- endif %}
   accept_policy: preseed
   bind: {}
   formula: {}
@@ -59,10 +59,10 @@
   {%- elif pillar.salt.minion.source.engine == 'pip' %}
   install_state: "pip: salt_minion_packages"
   {%- endif %}
-  {%- endif %}
   {%- if pillar.salt.minion.source.version is defined %}
   version: {{ pillar.salt.minion.source.version }}
   {%- endif %}
+  {%- endif %}
 {%- endload %}
 
 {%- load_yaml as minion_specific %}