diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml
index d00e7f2006..5fcc898797 100644
--- a/roles/bugzilla2fedmsg/tasks/main.yml
+++ b/roles/bugzilla2fedmsg/tasks/main.yml
@@ -51,8 +51,8 @@
     dest="/etc/pki/fedmsg/{{ item }}"
     mode=0640 owner=fedmsg group=fedmsg
   with_items:
-  - msg-client-fedora-dev.crt
-  - msg-client-fedora-dev.key
+  - msg-client-fedora-prod.crt
+  - msg-client-fedora-prod.key
   notify:
   - restart moksha-hub
   tags:
diff --git a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
index 15221c7782..3acb31c530 100644
--- a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
+++ b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
@@ -24,16 +24,16 @@ bugzilla.password = {{ bugzilla_password }}
 {% if env == 'staging' %}
 stomp_uri = messaging-devops-broker01.dist.stage.ext.phx2.redhat.com:61612,messaging-devops-broker02.dist.stage.ext.phx2.redhat.com:61612
 
-stomp_ssl_crt = /etc/pki/fedmsg/msg-client-fedora-dev.crt
-stomp_ssl_key = /etc/pki/fedmsg/msg-client-fedora-dev.key
+stomp_ssl_crt = /etc/pki/fedmsg/msg-client-fedora-prod.crt
+stomp_ssl_key = /etc/pki/fedmsg/msg-client-fedora-prod.key
 
 stomp_user = {{ redhat_dmz_dev_broker_username }}
 stomp_pass = {{ redhat_dmz_dev_broker_password }}
 {% else %}
 stomp_uri = messaging-devops-broker01.dist.prod.ext.phx2.redhat.com:61612,messaging-devops-broker02.dist.prod.ext.phx2.redhat.com:61612
 
-stomp_ssl_crt = /etc/pki/fedmsg/msg-client-fedora-dev.crt
-stomp_ssl_key = /etc/pki/fedmsg/msg-client-fedora-dev.key
+stomp_ssl_crt = /etc/pki/fedmsg/msg-client-fedora-prod.crt
+stomp_ssl_key = /etc/pki/fedmsg/msg-client-fedora-prod.key
 
 stomp_user = {{ redhat_dmz_prod_broker_username }}
 stomp_pass = {{ redhat_dmz_prod_broker_password }}