diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml
index 611b6d30d4..0249d940a8 100644
--- a/tasks/koji/releng_config.yml
+++ b/tasks/koji/releng_config.yml
@@ -202,17 +202,36 @@
     - base.py
   tags:
   - fedmsg
-- name: fedmsg ca and crt
+- name: fedmsg ca
   action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=644
   with_items:
     - ca.crt
+- name: fedmsg cert
+  action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=644
+  with_items:
     - bodhi-releng01.phx2.fedoraproject.org.crt
   tags:
   - fedmsg
+  only_if: "'${inventory_hostname}'.startswith('releng01')"
 - name: fedmsg key
   action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=640 group=masher
   with_items:
     - bodhi-releng01.phx2.fedoraproject.org.key
   tags:
   - fedmsg
+  only_if: "'${inventory_hostname}'.startswith('releng01')"
+- name: fedmsg cert
+  action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=644
+  with_items:
+    - bodhi-releng02.phx2.fedoraproject.org.crt
+  tags:
+  - fedmsg
+  only_if: "'${inventory_hostname}'.startswith('releng02')"
+- name: fedmsg key
+  action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=640 group=masher
+  with_items:
+    - bodhi-releng02.phx2.fedoraproject.org.key
+  tags:
+  - fedmsg
+  only_if: "'${inventory_hostname}'.startswith('releng02')"