diff --git a/roles/bodhi2/backend/files/createrepo_c.ini b/roles/bodhi2/backend/files/createrepo_c.ini
index 22ca397e2c..e72a7727e9 100644
--- a/roles/bodhi2/backend/files/createrepo_c.ini
+++ b/roles/bodhi2/backend/files/createrepo_c.ini
@@ -1,33 +1,74 @@
 [DEFAULT]
 # updateinfo-compress-type is used to generate updateinfo file in metadata.py
 # set the value to an attribute which match the python constant
-# Supported options are: BZ2, GZ, ZSTD, XZ.
-updateinfo-compress-type = XZ
+# Supported values are: BZ2, GZ, ZSTD, XZ.
+updateinfo-compress-type = ZSTD
 # repodata-compress-type is used in the CLI call to createrepo_c
 # set the value to match the `--compress-type=COMPRESSION_TYPE` option
-# Supported options are: bz2, gz, zck, zstd, xz.
-# Or leave empty for no compression.
-repodata-compress-type =
+# Supported values are: bz2, gz, zstd, xz.
+# Or leave empty for default compression from createrepo_c.
+repodata-compress-type = zstd
 # setting general-compress to True will switch usage of `--compress-type=COMPRESSION_TYPE`
 # to `--general-compress-type=COMPRESSION_TYPE`. See `man createrepo_c`.
-general-compress = False
+general-compress = True
 # zchunk is a boolean which enables zchunk on repodata
 zchunk = True
 # drpms_enabled is a boolean which enables DRPMs generation
-drpms_enabled = True
+drpms_enabled = False
+# sqlite_enabled is a boolean which enables metadata sqlite db creation
+sqlite_enabled = False
+# compatibility is a boolean which injects `--compatibility` flag
+# in createrepo_c command
+compatibility = False
 
 # Here you can override default values by matching Release.prefix_id or Release.name
 # If a value is not overridden, those from DEFAULT are used
 # Each section only inherits from DEFAULT, so `release` will not inherit from `prefix`.
 # 'release' take precedence over 'prefix' as it is more specific.
 [prefix.FEDORA-EPEL]
+compatibility = True
 updateinfo-compress-type = BZ2
+drpms_enabled = True
+general-compress = False
+# The following should be superflous as they are overridden by compatibility flag
+repodata-compress-type = gz
 zchunk = False
+sqlite_enabled = True
 
 [release.EPEL-8]
 updateinfo-compress-type = BZ2
 repodata-compress-type = xz
+general-compress = False
 zchunk = False
+drpms_enabled = True
+sqlite_enabled = True
 
 [release.F40]
+compatibility = True
+updateinfo-compress-type = XZ
 drpms_enabled = False
+general-compress = False
+# The following should be superflous as they are overridden by compatibility flag
+repodata-compress-type =
+zchunk = True
+sqlite_enabled = True
+
+[release.F39]
+compatibility = True
+updateinfo-compress-type = XZ
+drpms_enabled = True
+general-compress = False
+# The following should be superflous as they are overridden by compatibility flag
+repodata-compress-type =
+zchunk = True
+sqlite_enabled = True
+
+[release.F38]
+compatibility = True
+updateinfo-compress-type = XZ
+drpms_enabled = True
+general-compress = False
+# The following should be superflous as they are overridden by compatibility flag
+repodata-compress-type =
+zchunk = True
+sqlite_enabled = True
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 5f33a119d1..91edf149fa 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -70,7 +70,13 @@ createrepo_deltas = [
     ('^Everything$', {'*': False})
 ]
 [% endif %]
+
+[% if cr_config.sqlite_enabled %]
 createrepo_database = True
+[% else %]
+createrepo_database = False
+[% endif %]
+
 createrepo_extra_args = [
 [% if cr_config.zchunk %]
     '--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]',
@@ -82,6 +88,9 @@ createrepo_extra_args = [
     '--compress-type=[[ cr_config.repodata_comp ]]',
 [% endif %]
 [% endif %]
+[% if cr_config.compatibility %]
+    '--compatibility',
+[% endif %]
 ]
 
 # CHECKSUMS