diff --git a/Manual.org b/Manual.org
index 740f46b..fdecafe 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1482,7 +1482,7 @@ description of the config file format.
 :END:
 #+BEGIN_SRC conf :tangle roles/nfs-server/templates/nfs-exports.j2 :mkdirp yes :padline no
 /srv *(rw,fsid=0,sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }})
-{% for name, path in media_dirs.iteritems() %}
+{% for name, path in media_dirs.items() | list %}
 {{ path }} *(rw,fsid={{ loop.index }},sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }}{{ ',insecure' if nfs.insecure else '' }})
 {% endfor %}
 #+END_SRC
@@ -5332,7 +5332,7 @@ end
 :ID:       19a7e6f8-5795-45ff-983e-9da37e7dce26
 :END:
 #+BEGIN_SRC yaml :tangle roles/samba-config/templates/smb.conf.j2 :mkdirp yes
-{% for name, path in media_dirs.iteritems() %}
+{% for name, path in media_dirs.items() | list %}
 [{{ name }}]
    path = {{ path }}
    comment = {{ name }} on %h
diff --git a/roles/nfs-server/templates/nfs-exports.j2 b/roles/nfs-server/templates/nfs-exports.j2
index eabb162..3fea5b3 100644
--- a/roles/nfs-server/templates/nfs-exports.j2
+++ b/roles/nfs-server/templates/nfs-exports.j2
@@ -1,4 +1,4 @@
 /srv *(rw,fsid=0,sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }})
-{% for name, path in media_dirs.iteritems() %}
+{% for name, path in media_dirs.items() | list %}
 {{ path }} *(rw,fsid={{ loop.index }},sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }}{{ ',insecure' if nfs.insecure else '' }})
 {% endfor %}
diff --git a/roles/samba-config/templates/smb.conf.j2 b/roles/samba-config/templates/smb.conf.j2
index 63dab45..f2f113f 100644
--- a/roles/samba-config/templates/smb.conf.j2
+++ b/roles/samba-config/templates/smb.conf.j2
@@ -78,7 +78,7 @@
    follow symlinks= yes
    wide links= yes
 {% endif %}
-{% for name, path in media_dirs.iteritems() %}
+{% for name, path in media_dirs.items() | list %}
 [{{ name }}]
    path = {{ path }}
    comment = {{ name }} on %h
diff --git a/roles/yavdr-xorg/templates/20-intel.conf.j2 b/roles/yavdr-xorg/templates/20-intel.conf.j2
index b425a2d..4a6a78b 100644
--- a/roles/yavdr-xorg/templates/20-intel.conf.j2
+++ b/roles/yavdr-xorg/templates/20-intel.conf.j2
@@ -90,7 +90,7 @@ Section "Monitor"
 EndSection
 
 {% endif %}
-{% for connector, data in xrandr["Screen 0:"].iteritems() %}
+{% for connector, data in xrandr["Screen 0:"].items() | list %}
 {% if not data.is_connected or connector != xorg.primary.connector or (xorg.secondary is defined and connector != xorg.secondary.connector) %}
 Section "Monitor"
   Identifier "{{ connector|replace("-","") }}"