diff --git a/roles/openshift-apps/waiverdb/templates/imagestream.yml b/roles/openshift-apps/waiverdb/templates/imagestream.yml
index 7b6febdc7c..8d21168e04 100644
--- a/roles/openshift-apps/waiverdb/templates/imagestream.yml
+++ b/roles/openshift-apps/waiverdb/templates/imagestream.yml
@@ -17,10 +17,12 @@ spec:
 {% if env == 'staging' %}
       # The latest successful build of master that passes tests
       # is auto-tagged here. 
-      name: quay.io/adamwill/waiverdb-test:latest
+      name: quay.io/factory2/waiverdb:latest
 {% else %}
       # This is 'prod' tag is maintained by hand.
       # name: quay.io/factory2/waiverdb:prod-fedora
-      # Changing prod just for now to this image
-      name: quay.io/adamwill/waiverdb-test:latest
+      # Changing prod just for now to this image as the fix
+      # for https://github.com/release-engineering/waiverdb/issues/219
+      # is not yet in prod-fedora
+      name: quay.io/factory2/waiverdb:latest
 {% endif %}