diff --git a/roles/openshift-apps/greenwave/templates/imagestream.yml b/roles/openshift-apps/greenwave/templates/imagestream.yml
index fe9cf8313a..30da7db1ed 100644
--- a/roles/openshift-apps/greenwave/templates/imagestream.yml
+++ b/roles/openshift-apps/greenwave/templates/imagestream.yml
@@ -17,7 +17,13 @@ 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/factory2/greenwave:latest
+      # ... but for now we are pinning it to this specific commit:
+      name: quay.io/factory2/greenwave:0.7.2.dev24-git.c3b193e
+      # because we are about to land potentially disruptive changes in
+      # https://pagure.io/greenwave/pull-request/184 and we don't want to
+      # interfere with Bodhi development which is happening against
+      # Greenwave stage right now.
 {% else %}
       # This is 'prod' tag is maintained by hand.
       name: quay.io/factory2/greenwave:prod
diff --git a/roles/openshift-apps/waiverdb/templates/imagestream.yml b/roles/openshift-apps/waiverdb/templates/imagestream.yml
index 16b7543f4e..9874ba5e57 100644
--- a/roles/openshift-apps/waiverdb/templates/imagestream.yml
+++ b/roles/openshift-apps/waiverdb/templates/imagestream.yml
@@ -17,7 +17,13 @@ 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/factory2/waiverdb:latest
+      # ... but for now we are pinning it to this specific commit:
+      name: quay.io/factory2/waiverdb:0.10.1.dev16-git.15b9a4c
+      # because we are about to land potentially disruptive changes in
+      # https://pagure.io/waiverdb/pull-request/175 and we don't want to
+      # interfere with Bodhi development which is happening against
+      # Waiverdb stage right now.
 {% else %}
       # This is 'prod' tag is maintained by hand.
       name: quay.io/factory2/waiverdb:prod