diff --git a/roles/bodhi2/backend/files/pungi.rpm.conf.j2 b/roles/bodhi2/backend/files/pungi.rpm.conf.j2
index ffaf8dd233..4556e7a32e 100644
--- a/roles/bodhi2/backend/files/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/files/pungi.rpm.conf.j2
@@ -11,7 +11,13 @@ comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': None, # defaults to cvs/HEAD or git/master
-    'file': 'comps-f{{ release.version_int }}.xml',
+    {% if release.version_int == 6 %}
+        'file': 'comps-el6.xml',
+    {% elif release.version_int == 7 %}
+        'file': 'comps-epel7.xml',
+    {% else %}
+        'file': 'comps-f{{ release.version_int }}.xml',
+    {% endif %}
     'command': 'make',
 }
 variants_file='variants-fedora.xml'