diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index 49c091985c..97c5e620e7 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -58,13 +58,17 @@
   - config
   - bodhi
 
-- name: Copy a logging configuration in for the fedmsg-hub
-  copy: >
-      src=bodhi-logging.py
-      dest=/etc/fedmsg.d/bodhi-logging.py
+- name: Copy some fedmsg configuration of our own for fedmsg-hub
+  template: >
+      src={{item}}
+      dest=/etc/fedmsg.d/{{item}}
       owner=root
       group=root
       mode=0644
+  with_items:
+  - bodhi-logging.py
+  - bodhi.py
+  - masher.py
   notify:
   - restart fedmsg-hub
   tags:
diff --git a/roles/bodhi2/base/files/bodhi-logging.py b/roles/bodhi2/base/templates/bodhi-logging.py
similarity index 100%
rename from roles/bodhi2/base/files/bodhi-logging.py
rename to roles/bodhi2/base/templates/bodhi-logging.py
diff --git a/roles/bodhi2/base/templates/bodhi.py b/roles/bodhi2/base/templates/bodhi.py
new file mode 100644
index 0000000000..55d001772e
--- /dev/null
+++ b/roles/bodhi2/base/templates/bodhi.py
@@ -0,0 +1,5 @@
+# This file is empty on purpose.
+#
+# The bodhi-server rpm ships an /etc/fedmsg.d/bodhi.py file by default that has
+# some nice local settings for testing, but which don't make sense for our
+# infrastructure.  So... we overwrite it with this empty file.
diff --git a/roles/bodhi2/base/templates/masher.py b/roles/bodhi2/base/templates/masher.py
new file mode 100644
index 0000000000..3ed88f6ba3
--- /dev/null
+++ b/roles/bodhi2/base/templates/masher.py
@@ -0,0 +1,11 @@
+{% if env == 'staging' %}
+suffix = 'stg.phx2.fedoraproject.org'
+{% else %}
+suffix = 'phx2.fedoraproject.org'
+{% endif %}
+
+config = dict(
+    masher=True,
+    masher_topic='bodhi.masher.start',
+    releng_fedmsg_certname='shell-bodhi-backend01.%s' % suffix,
+)