diff --git a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
index 41c9e9c2c7..614d125a49 100644
--- a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
+++ b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
@@ -109,6 +109,9 @@ file_check_url = "https://src.fedoraproject.org/%(namespace)s/%(repo)s/blob/%(br
 [consumer_config.pdc_import_compose]
 old_composes_url = "https://kojipkgs.fedoraproject.org/compose/"
 
+[consumer_config.pdc_modules]
+mbs_url = "https://mbs.fedoraproject.org/module-build-service/2/module-builds/"
+
 
 [qos]
 prefetch_size = 0
diff --git a/roles/packages3/bugz.fp.o/files/bugz.conf b/roles/packages3/bugz.fp.o/files/bugz.conf
index f8d5463acf..9241bcbfb4 100644
--- a/roles/packages3/bugz.fp.o/files/bugz.conf
+++ b/roles/packages3/bugz.fp.o/files/bugz.conf
@@ -1,5 +1,5 @@
 RewriteEngine On
 RewriteMap lowercase int:tolower
 
-RewriteRule ^/(.+) https://apps.fedoraproject.org/packages/$1/bugs/all [R,L]
+RewriteRule ^/(.+) https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&classification=Fedora&product=Fedora&product=Fedora%20EPEL&component=$1 [R,L]
 RewriteRule ^/$ https://bugzilla.redhat.com/ [R,L]