diff --git a/roles/openshift-apps/greenwave/templates/imagestream.yml b/roles/openshift-apps/greenwave/templates/imagestream.yml
index 9c564644fb..bd35237806 100644
--- a/roles/openshift-apps/greenwave/templates/imagestream.yml
+++ b/roles/openshift-apps/greenwave/templates/imagestream.yml
@@ -20,5 +20,9 @@ spec:
       name: quay.io/factory2/greenwave:latest
 {% else %}
       # This is 'prod' tag is maintained by hand.
-      name: quay.io/factory2/greenwave:prod
+      #name: quay.io/factory2/greenwave:prod
+      # But, pin it to 0.9.4 until we can resolve
+      # https://github.com/fedora-infra/bodhi/issues/2554
+      # https://pagure.io/greenwave/issue/287
+      name: quay.io/factory2/greenwave:0.9.4
 {% endif %}