diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 37a844d4c1..2ef07a58ed 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -44,7 +44,7 @@ filter_system_release_packages = False
 
 # GATHER
 gather_source = 'comps'
-gather_method = 'nodeps'
+gather_method = 'deps'
 gather_backend = 'dnf'
 check_deps = False
 greedy_method = 'build'
@@ -127,7 +127,7 @@ ostree = [
 [% endif %]
 
 translate_paths = [
-   ('/mnt/koji/compose/', 'https://kojipkgs.stg.fedoraproject.org/compose/'),
+   ('/mnt/koji/compose/', 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/'),
 ]
 koji_profile = 'bodhi_koji'
 link_type = 'hardlink-or-copy'