diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml
index 9e19c8e129..db851cb30a 100644
--- a/playbooks/openshift-apps/messaging-bridges.yml
+++ b/playbooks/openshift-apps/messaging-bridges.yml
@@ -20,26 +20,12 @@
     app: messaging-bridges
     secret_name: fedmsg-key
     key: fedmsg-fedmsg-migration-tools.key
-    privatefile: fedmsg-certs/keys/messaging-bridges-stg.key
-    when: env == "staging"
+    privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.key"
   - role: openshift/secret-file
     app: messaging-bridges
     secret_name: fedmsg-cert
     key: fedmsg-fedmsg-migration-tools.crt
-    privatefile: fedmsg-certs/keys/messaging-bridges-stg.crt
-    when: env == "staging"
-  - role: openshift/secret-file
-    app: messaging-bridges
-    secret_name: fedmsg-key
-    key: fedmsg-fedmsg-migration-tools.key
-    privatefile: fedmsg-certs/keys/messaging-bridges.key
-    when: env != "staging"
-  - role: openshift/secret-file
-    app: messaging-bridges
-    secret_name: fedmsg-cert
-    key: fedmsg-fedmsg-migration-tools.crt
-    privatefile: fedmsg-certs/keys/messaging-bridges.crt
-    when: env != "staging"
+    privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.crt"
 
   - role: openshift/object
     app: messaging-bridges