diff --git a/roles/openshift-apps/greenwave/templates/imagestream.yml.j2 b/roles/openshift-apps/greenwave/templates/imagestream.yml.j2
index 4a2619facd..3f091ee788 100644
--- a/roles/openshift-apps/greenwave/templates/imagestream.yml.j2
+++ b/roles/openshift-apps/greenwave/templates/imagestream.yml.j2
@@ -13,8 +13,8 @@ spec:
 {% if env == 'staging' %}
       # The latest successful build of master that passes tests
       # is auto-tagged here. 
-      name: quay.io/factory2/greenwave:latest
+      name: quay.io/redhat-user-workloads/exd-sp-rhel-wf-tenant/greenwave:latest
 {% else %}
       # This is 'prod' tag is maintained by hand.
-      name: quay.io/factory2/greenwave:prod-fedora
+      name: quay.io/redhat-user-workloads/exd-sp-rhel-wf-tenant/greenwave:prod-fedora
 {% endif %}
diff --git a/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2 b/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2
index 3600a57213..ea02371a66 100644
--- a/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2
+++ b/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2
@@ -13,8 +13,8 @@ spec:
 {% if env == 'staging' %}
       # The latest successful build of master that passes tests
       # is auto-tagged here. 
-      name: quay.io/factory2/waiverdb:latest
+      name: quay.io/redhat-user-workloads/exd-sp-rhel-wf-tenant/waiverdb:latest
 {% else %}
       # This is 'prod' tag is maintained by hand.
-      name: quay.io/factory2/waiverdb:prod-fedora
+      name: quay.io/redhat-user-workloads/exd-sp-rhel-wf-tenant/waiverdb:prod-fedora
 {% endif %}