diff --git a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
index 1433ea1f97..224b56c9f7 100644
--- a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
+++ b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml
@@ -64,11 +64,10 @@ blocked_toddlers = [
 
 
 # Configuration used when sending notifications:
+mail_server = "bastion.fedoraproject.org"
 {% if env == "staging" %}
-mail_server = "bastion.stg.fedoraproject.org"
 admin_email = "admin@stg.fedoraproject.org"
 {% else %}
-mail_server = "bastion.fedoraproject.org"
 admin_email = "admin@fedoraproject.org"
 {% endif %}
 
diff --git a/vars/apps/poddlers.yml b/vars/apps/poddlers.yml
index 6215d815fd..ea3de0b373 100644
--- a/vars/apps/poddlers.yml
+++ b/vars/apps/poddlers.yml
@@ -53,6 +53,12 @@ poddlers_toddlers:
     topics:
       - "org.fedoraproject.*.toddlers.trigger.packagers_without_bugzilla"
 
+  - name: pagure-fas-groups-sync
+    callback: pagure_fas_groups_sync:PagureFASGroupsSync
+    topics:
+      - "org.fedoraproject.*.fas.group.member.sponsor"
+      - "org.fedoraproject.*.toddlers.trigger.pagure_fas_groups_sync"
+
   # - name: pdc-import-compose
   #   callback: pdc_import_compose:PDCImportCompose
   #   topics:
@@ -76,12 +82,6 @@ poddlers_toddlers:
       - "org.fedoraproject.*.pagure.issue.edit"
       - "org.fedoraproject.*.pagure.issue.comment.added"
 
-  - name: pagure-fas-groups-sync
-    callback: pagure_fas_groups_sync:PagureFASGroupsSync
-    topics:
-      - "org.fedoraproject.*.fas.group.member.sponsor"
-      - "org.fedoraproject.*.toddlers.trigger.pagure_fas_groups_sync"
-
 poddlers_cronjobs:
   - name: packager-bugzilla-sync
     schedule: "0 */6 * * *"