diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
index 84e0509..cca2407 100644
--- a/salt/files/master.d/_defaults.conf
+++ b/salt/files/master.d/_defaults.conf
@@ -613,10 +613,10 @@ fileserver_backend:
 gitfs_remotes:
 {%- for remote in master['gitfs_remotes'] %}
 {%- if remote is iterable and remote is not string %}
-  {%- for repo, children in remote.iteritems() %}
+  {%- for repo, children in remote.items() %}
     - {{ repo }}:
   {%- for child in children %}
-    {%- for key, value in child.iteritems() %}
+    {%- for key, value in child.items() %}
       - {{ key }}: {{ value }}
     {%- endfor -%}
   {%- endfor -%}
@@ -942,7 +942,7 @@ win_gitrepos:
 #####             Halite             #####
 ##########################################
 halite:
-  {% for name, value in master['halite'].iteritems() %}
+  {% for name, value in master['halite'].items() %}
   {{ name }}: {{ value }}
   {% endfor %}
 {% endif %}
@@ -951,7 +951,7 @@ halite:
 #####         rest_cherrypy          #####
 ##########################################
 rest_cherrypy:
-  {% for name, value in master['rest_cherrypy'].iteritems() %}
+  {% for name, value in master['rest_cherrypy'].items() %}
   {{ name }}: {{ value }}
   {% endfor %}
 {% endif %}
diff --git a/salt/files/minion.d/_defaults.conf b/salt/files/minion.d/_defaults.conf
index 95be519..875e1e0 100644
--- a/salt/files/minion.d/_defaults.conf
+++ b/salt/files/minion.d/_defaults.conf
@@ -458,10 +458,10 @@ file_roots:
 gitfs_remotes:
 {%- for remote in minion['gitfs_remotes'] %}
 {%- if remote is iterable and remote is not string %}
-  {%- for repo, children in remote.iteritems() %}
+  {%- for repo, children in remote.items() %}
     - {{ repo }}:
   {%- for child in children %}
-    {%- for key, value in child.iteritems() %}
+    {%- for key, value in child.items() %}
       - {{ key }}: {{ value }}
     {%- endfor -%}
   {%- endfor -%}