diff --git a/roles/bodhi2/base/templates/staging.ini.j2 b/roles/bodhi2/base/templates/staging.ini.j2
index fe5471d426..267537a9c8 100644
--- a/roles/bodhi2/base/templates/staging.ini.j2
+++ b/roles/bodhi2/base/templates/staging.ini.j2
@@ -85,18 +85,9 @@ releng_fedmsg_certname = shell-bodhi-backend01.stg.phx2.fedoraproject.org
 # will act as a masher as well.
 #masher = None
 
-# Where to initially mash repositories
-# mash_dir = /var/cache/bodhi/mashing
-
-# Where to symlink the latest repos by their tag name
-# mash_stage_dir = /var/cache/bodhi/mashed
-
-pungi_conf = /etc/bodhi/fedora-atomic.conf
-mash_dir = /mnt/koji/compose/updates/
-mash_stage_dir = /mnt/koji/compose/updates/
-mash_conf = /etc/bodhi/mash.conf
-
-createrepo_cache_dir = /var/cache/createrepo
+pungi.basepath = /etc/bodhi
+pungi.conf.rpm = pungi.rpm.conf.j2
+pungi.conf.module = pungi.module.conf.j2
 
 ## Our periodic jobs
 #jobs = clean_repo nagmail fix_bug_titles cache_release_data approve_testing_updates