diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index 2661f9a738..3ea7740ebb 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -39,13 +39,13 @@
     app: bodhi
     secret_name: bodhi-fedora-messaging-crt
     key: bodhi-cert.pem
-    privatefile: "rabbitmq/{{env}}/pki/issued/<app>.crt"
+    privatefile: "rabbitmq/{{env}}/pki/issued/bodhi{{env}}.crt"
     when: env == "staging"
   - role: openshift/secret-file
     app: bodhi
     secret_name: bodhi-fedora-messaging-key
     key: bodhi-key.pem
-    privatefile: "rabbitmq/{{env}}/pki/private/bodhi.key"
+    privatefile: "rabbitmq/{{env}}/pki/private/bodhi{{env}}.key"
     when: env == "staging"
   # When we deploy Bodhi 4.0.0 to production, we can drop these fedmsg secrets.
   - role: openshift/secret-file
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 5a607ef239..b9f1a6b021 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -454,7 +454,7 @@
 # The when staging should be dropped when we deploy Bodhi 4.0.0 to production.
 - name: Deploy the fedora-messaging cert
   copy:
-    src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/bodhi.crt"
+    src: "{{ private }}/files/rabbitmq/{{env}}/pki/issued/bodhi{{env}}.crt"
     dest: /etc/fedora-messaging/bodhi-cert.pem
     mode: 0644
     owner: apache
@@ -465,7 +465,7 @@
 # The when staging should be dropped when we deploy Bodhi 4.0.0 to production.
 - name: Deploy the fedora-messaging key
   copy:
-    src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/bodhi.key"
+    src: "{{ private }}/files/rabbitmq/{{env}}/pki/private/bodhi{{env}}.key"
     dest: /etc/fedora-messaging/bodhi-key.pem
     mode: 0600
     owner: apache