diff --git a/roles/bodhi2/backend/files/pungi_general.conf b/roles/bodhi2/backend/files/pungi_general.conf
new file mode 100644
index 0000000000..b78d016706
--- /dev/null
+++ b/roles/bodhi2/backend/files/pungi_general.conf
@@ -0,0 +1,15 @@
+# PRODUCT INFO
+release_is_layered = False
+
+hashed_directories = True
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+filter_system_release_packages = False
+
+# GATHER
+greedy_method = 'build'
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
diff --git a/roles/bodhi2/backend/files/pungi_multilib.conf b/roles/bodhi2/backend/files/pungi_multilib.conf
new file mode 100644
index 0000000000..5df5af8f99
--- /dev/null
+++ b/roles/bodhi2/backend/files/pungi_multilib.conf
@@ -0,0 +1,84 @@
+# MULTILIB
+# Note: If you change something here (affects updates for stable releases), also
+# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
+# we want to keep them in sync:
+# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+#
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': [
+        'dmraid-devel',
+        'ghc-*',
+        'httpd-core',
+        'httpd-devel',
+        'java-1.5.0-gcj-devel',
+        'java-1.6.0-openjdk-devel',
+        'java-1.7.0-icedtea-devel',
+        'java-1.7.0-openjdk-devel',
+        'java-1.8.0-openjdk-devel',
+        'kdeutils-devel',
+        'kernel*',
+        'kernel*debug*',
+        'kernel-PAE*',
+        'krb5-server',
+        'krb5-server-ldap',
+        'mkinitrd-devel',
+        'mod_*',
+        'mp',
+        'php*',
+        'php-devel',
+        'tomcat-native',
+        ],
+}
+
+# Note: If you change something here (affects updates for stable releases), also
+# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
+# we want to keep them in sync:
+# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+#
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': [
+        '*-static',
+        'apitrace-libs',
+        'compiler-rt',
+        'dssi-vst-wine',
+        'fakechroot-libs',
+        'fakeroot-libs',
+        'glib-networking',
+        'glx-utils',
+        'ibus-gtk2',
+        'ibus-gtk3',
+        'ibus-libs',
+        'iptables',
+        'libflashsupport',
+        'libgnat',
+        'libomp',
+        'lmms-vst',
+        'mangohud',
+        'mariadb-connector-odbc',
+        'mesa-dri-drivers',
+        'mesa-va-drivers',
+        'mesa-vdpau-drivers',
+        'mesa-vulkan-drivers',
+        'mysql-connector-odbc',
+        'nosync',
+        'nspluginwrapper',
+        'nvidia-query-resource-opengl-lib',
+        'p11-kit-trust',
+        'pam',
+        'perl-libs',
+        'pipewire',
+        'postgresql-odbc',
+        'redhat-lsb',
+        'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux',
+        'syslinux-tftpboot',
+        'systemd-pam',
+        'valgrind',
+        'vkBasalt',
+        'wine',
+        'wine-*',
+        'yaboot',
+        ],
+}
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 11ef8f66c4..dd2b9a2d60 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -69,6 +69,23 @@
   - bodhi/pungi
   - config
 
+- name: Put pungi multilib configuration in place
+  copy:
+    src: pungi_multilib.conf
+    dest: /etc/bodhi/pungi_multilib.conf
+  tags:
+  - bodhi
+  - bodhi/pungi
+  - config
+
+- name: Put pungi general configuration in place
+  copy:
+    src: pungi_general.conf
+    dest: /etc/bodhi/pungi_general.conf
+  tags:
+  - bodhi
+  - bodhi/pungi
+  - config
 #
 # koji ssl cert for owner sync jobs below
 #
diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2
index a2db5ef30a..294bb558b2 100644
--- a/roles/bodhi2/backend/templates/pungi.module.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2
@@ -1,9 +1,14 @@
+# Import shared settings from pungi_general.conf
+from pungi_general import *
+# Import multilib settings from pungi_multilib.conf
+from pungi_multilib import *
+
 # PRODUCT INFO
-release_name = '[[ release.id_prefix.title() ]]'
-release_short = '[[ release.id_prefix.title() ]]'
 release_version = '[[ release.version ]]'
 release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
-release_is_layered = False
+release_name = '[[ release.id_prefix.title() ]]'
+release_short = '[[ release.id_prefix.title() ]]'
+
 
 # GENERAL SETTINGS
 bootable = False
@@ -82,8 +87,6 @@ module_obsoletes_dir = {
     'dir': 'obsoletes'
 }
 
-hashed_directories = True
-
 # RUNROOT settings
 runroot = False
 
@@ -92,20 +95,12 @@ pdc_url = 'https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1'
 pdc_insecure = False
 pdc_develop = True
 
-# PKGSET
-pkgset_source = 'koji' # koji, repos
-
-filter_system_release_packages = False
-
 # GATHER
 gather_method = 'nodeps'
 gather_profiler = True
 check_deps = False
-greedy_method = 'build'
 
 # CREATEREPO
-createrepo_c = True
-createrepo_checksum = 'sha256'
 createrepo_deltas = False
 [% if release.version_int >= 30 %]
 createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]']
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 11724068c6..eff31ccfe8 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -1,11 +1,15 @@
+# Import shared settings from pungi_general.conf
+from pungi_general import *
+# Import multilib settings from pungi_multilib.conf
+from pungi_multilib import *
+
 # PRODUCT INFO
 skip_phases = ["buildinstall", "extra_files"]
-release_name = '[[ release.id_prefix.title() ]]'
-release_short = '[[ release.id_prefix.title() ]]'
 release_version = '[[ release.version_int ]]'
 release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
-release_is_layered = False
 old_composes_per_release_type = True
+release_name = '[[ release.id_prefix.title() ]]'
+release_short = '[[ release.id_prefix.title() ]]'
 
 # GENERAL SETTINGS
 comps_file = {
@@ -58,7 +62,6 @@ sigkeys = [
     None
 {% endif %}
 ]
-hashed_directories = True
 comps_filter_environments = False
 
 # RUNROOT settings
@@ -67,22 +70,17 @@ runroot_channel = 'compose'
 runroot_tag = 'f[[ release.version_int ]]-build'
 
 # PKGSET
-pkgset_source = 'koji' # koji, repos
 pkgset_koji_tag = '[[ id ]]'
 pkgset_koji_inherit = False
 pkgset_allow_reuse = False
-filter_system_release_packages = False
 
 # GATHER
 gather_method = 'deps'
 gather_backend = 'dnf'
 check_deps = False
-greedy_method = 'build'
 repoclosure_backend = 'dnf'
 
 # CREATEREPO
-createrepo_c = True
-createrepo_checksum = 'sha256'
 createrepo_deltas = [
     ('^Everything$', {'*': True})
 ]
@@ -119,90 +117,6 @@ multilib = [
 ]
 filter_packages = []
 
-# Note: If you change something here (affects updates for stable releases), also
-# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
-# we want to keep them in sync:
-# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
-#
-# format: {arch|*: [packages]}
-multilib_blacklist = {
-    '*': [
-        'dmraid-devel',
-        'ghc-*',
-        'httpd-core',
-        'httpd-devel',
-        'java-1.5.0-gcj-devel',
-        'java-1.6.0-openjdk-devel',
-        'java-1.7.0-icedtea-devel',
-        'java-1.7.0-openjdk-devel',
-        'java-1.8.0-openjdk-devel',
-        'kdeutils-devel',
-        'kernel*',
-        'kernel*debug*',
-        'kernel-PAE*',
-        'krb5-server',
-        'krb5-server-ldap',
-        'mkinitrd-devel',
-        'mod_*',
-        'mp',
-        'php*',
-        'php-devel',
-        'tomcat-native',
-        ],
-}
-
-# Note: If you change something here (affects updates for stable releases), also
-# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
-# we want to keep them in sync:
-# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
-#
-# format: {arch|*: [packages]}
-multilib_whitelist = {
-    '*': [
-        '*-static',
-        'apitrace-libs',
-        'compiler-rt',
-        'dssi-vst-wine',
-        'fakechroot-libs',
-        'fakeroot-libs',
-        'glib-networking',
-        'glx-utils',
-        'ibus-gtk2',
-        'ibus-gtk3',
-        'ibus-libs',
-        'iptables',
-        'libflashsupport',
-        'libgnat',
-        'libomp',
-        'lmms-vst',
-        'mangohud',
-        'mariadb-connector-odbc',
-        'mesa-dri-drivers',
-        'mesa-va-drivers',
-        'mesa-vdpau-drivers',
-        'mesa-vulkan-drivers',
-        'mysql-connector-odbc',
-        'nosync',
-        'nspluginwrapper',
-        'nvidia-query-resource-opengl-lib',
-        'p11-kit-trust',
-        'pam',
-        'perl-libs',
-        'pipewire',
-        'postgresql-odbc',
-        'redhat-lsb',
-        'syslinux-extlinux-nonlinux',
-        'syslinux-nonlinux',
-        'syslinux-tftpboot',
-        'systemd-pam',
-        'valgrind',
-        'vkBasalt',
-        'wine',
-        'wine-*',
-        'yaboot',
-        ],
-}
-
 createiso_skip = [
         ('^Everything$', {
             '*': True,