diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml
index 663242718e..0daf6720e2 100644
--- a/playbooks/openshift-apps/release-monitoring.yml
+++ b/playbooks/openshift-apps/release-monitoring.yml
@@ -18,30 +18,30 @@
     app: release-monitoring
     secret_name: release-monitoring-fedora-messaging-ca
     key: fedora-messaging-release-monitoring.ca
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/ca.crt
+    privatefile: "rabbitmq/{{env}}/pki/ca.crt"
   - role: openshift/secret-file
     app: release-monitoring
     secret_name: release-monitoring-fedora-messaging-key
     key: fedora-messaging-release-monitoring.key
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/release-monitoring.stg.key
+    privatefile: "rabbitmq/{{env}}/pki/private/release-monitoring.{{env_suffix}}.key"
     when: env == "staging"
   - role: openshift/secret-file
     app: release-monitoring
     secret_name: release-monitoring-fedora-messaging-cert
     key: fedora-messaging-release-monitoring.crt
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/release-monitoring.stg.crt
+    privatefile: "rabbitmq/{{env}}/pki/private/release-monitoring.{{env_suffix}}.crt"
     when: env == "staging"
   - role: openshift/secret-file
     app: release-monitoring
     secret_name: release-monitoring-fedora-messaging-key
     key: fedora-messaging-release-monitoring.key
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/release-monitoring.key
+    privatefile: "rabbitmq/{{ env }}/pki/private/release-monitoring.key"
     when: env != "staging"
   - role: openshift/secret-file
     app: release-monitoring
     secret_name: release-monitoring-fedora-messaging-cert
     key: fedora-messaging-release-monitoring.crt
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/release-monitoring.crt
+    privatefile: "rabbitmq/{{ env }}/pki/private/release-monitoring.crt"
     when: env != "staging"
   - role: openshift/object
     app: release-monitoring
diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml
index f221f9f168..2d75a05a0d 100644
--- a/playbooks/openshift-apps/the-new-hotness.yml
+++ b/playbooks/openshift-apps/the-new-hotness.yml
@@ -19,34 +19,34 @@
     app: the-new-hotness
     secret_name: the-new-hotness-fedora-messaging-ca
     key: fedora-messaging-the-new-hotness.ca
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/ca.crt
+    privatefile: "rabbitmq/{{env}}/pki/ca.crt"
 
   - role: openshift/secret-file
     app: the-new-hotness
     secret_name: the-new-hotness-fedora-messaging-key
     key: fedora-messaging-the-new-hotness.key
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/the-new-hotness.stg.key
+    privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness.{{env_suffix}}.key"
     when: env == "staging"
 
   - role: openshift/secret-file
     app: the-new-hotness
     secret_name: the-new-hotness-fedora-messaging-cert
     key: fedora-messaging-the-new-hotness.crt
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/the-new-hotness.stg.crt
+    privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness.{{env_suffix}}.crt"
     when: env == "staging"
 
   - role: openshift/secret-file
     app: the-new-hotness
     secret_name: the-new-hotness-fedora-messaging-key
     key: fedora-messaging-the-new-hotness.key
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/the-new-hotness.key
+    privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness.key"
     when: env != "staging"
 
   - role: openshift/secret-file
     app: the-new-hotness
     secret_name: the-new-hotness-fedora-messaging-cert
     key: fedora-messaging-the-new-hotness.crt
-    privatefile: {{private}}/files/rabbitmq/{{env}}/pki/private/the-new-hotness.crt
+    privatefile: "rabbitmq/{{env}}/pki/private/the-new-hotness.crt"
     when: env != "staging"
 
   - role: openshift/object