diff --git a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
index 87d804424b..ec2ff22069 100644
--- a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
+++ b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
@@ -192,12 +192,6 @@ notify_admins = [
 ]
 {% endif %}
 
-# PDC types mapping for distgit_bugzilla_sync toddler
-[consumer_config.distgit_bugzilla_sync.pdc_types]
-"rpms" = "rpm"
-"modules" = "module"
-"container" = "container"
-
 # Bugzilla products informations for Fedora
 [consumer_config.distgit_bugzilla_sync.products]
 
@@ -207,13 +201,10 @@ namespace = "rpms"
 versions = ["rawhide", "41", "40", "39", "38"]
 
 [consumer_config.distgit_bugzilla_sync.products."Fedora Container Images"]
+branch_regex = '^((f\d+)|rawhide)$'
 namespace = "container"
 versions = ["rawhide", "41", "40", "39", "38"]
 
-[consumer_config.distgit_bugzilla_sync.products."Fedora Modules"]
-namespace = "modules"
-versions = []
-
 [consumer_config.distgit_bugzilla_sync.products."Fedora EPEL"]
 branch_regex = '^epel\d+(?:\.\d+)?$'
 versions = ["epel10", "epel9", "epel8"]