diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml
index 83f4b9f409..ac3f4c6272 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:
-  - fedora.devel.engineering.redhat.com.crt
-  - fedora.devel.engineering.redhat.com.key
+  - msg-client-fedora-dev.crt
+  - msg-client-fedora-dev.key
   when: env == 'staging'
   notify:
   - restart moksha-hub
diff --git a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
index cf6ce77da5..c1319fcc2a 100644
--- a/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
+++ b/roles/bugzilla2fedmsg/templates/bugzilla2fedmsg.ini
@@ -24,8 +24,8 @@ bugzilla.password = {{ bugzilla_password }}
 {% if env == 'staging' %}
 stomp_uri = messaging-devops-broker01.dev1.ext.devlab.redhat.com:61612,messaging-devops-broker02.dev1.ext.devlab.redhat.com:61612
 
-stomp_ssl_crt = /etc/pki/fedmsg/fedora.devel.engineering.redhat.com.crt
-stomp_ssl_key = /etc/pki/fedmsg/fedora.devel.engineering.redhat.com.key
+stomp_ssl_crt = /etc/pki/fedmsg/msg-client-fedora-dev.crt
+stomp_ssl_key = /etc/pki/fedmsg/msg-client-fedora-dev.key
 
 stomp_user = {{ redhat_dmz_dev_broker_username }}
 stomp_pass = {{ redhat_dmz_dev_broker_password }}