diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2
index bbff98c..d0cd16f 100644
--- a/pungi-build.conf.j2
+++ b/pungi-build.conf.j2
@@ -35,7 +35,11 @@ variants_file = {
 }
 hashed_directories = False
 
+{% if arch == 'x86_64' %}
+tree_arches = ['{{ arch }}', 'i686']
+{% else %}
 tree_arches = ['{{ arch }}']
+{% endif %}
 
 symlink_isos_to = 'isos/{{ arch }}'