diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index 5f31828621..3344558b60 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -17,6 +17,19 @@
     appowners:
     - mjia
     - dcallagh
+  # These secret roles also break if the secret already exists.  Can only be run once.
+  #- role: openshift/secret-file
+  #  app: greenwave
+  #  secret_name: greenwave-fedmsg-key
+  #  key: fedmsg-greenwave.key
+  #  privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.key
+  #  when: env == "staging"
+  #- role: openshift/secret-file
+  #  app: greenwave
+  #  secret_name: greenwave-fedmsg-crt
+  #  key: fedmsg-greenwave.crt
+  #  privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.crt
+  #  when: env == "staging"
   - { role: openshift/object, app: greenwave, file: imagestream.yml }
   - { role: openshift/object, app: greenwave, template: buildconfig.yml }
   - { role: openshift/start-build, app: greenwave, name: greenwave-docker-build }
diff --git a/roles/openshift-apps/greenwave/templates/deploymentconfig.yml b/roles/openshift-apps/greenwave/files/deploymentconfig.yml
similarity index 83%
rename from roles/openshift-apps/greenwave/templates/deploymentconfig.yml
rename to roles/openshift-apps/greenwave/files/deploymentconfig.yml
index a7aa9020c6..dbe2e547bf 100644
--- a/roles/openshift-apps/greenwave/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/greenwave/files/deploymentconfig.yml
@@ -98,26 +98,13 @@ spec:
       - name: fedmsg-config-volume
         configMap:
           name: greenwave-fedmsg-configmap
+      # This secret volume gets set up in the playbook
       - name: fedmsg-key-volume
         secret:
           secretName: greenwave-fedmsg-key
-          items:
-          - key: fedmsg-greenwave.key
-{% if env == 'staging' %}
-            path: {{private}}/files/fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.key
-{% else %}
-            path: {{private}}/files/fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.key
-{% endif %}
       - name: fedmsg-crt-volume
         secret:
           secretName: greenwave-fedmsg-crt
-          items:
-          - key: fedmsg-greenwave.crt
-{% if env == 'staging' %}
-            path: {{private}}/files/fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.crt
-{% else %}
-            path: {{private}}/files/fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.crt
-{% endif %}
   triggers:
   - type: ImageChange
     imageChangeParams: