diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index d642a343ac..662c16f755 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -550,13 +550,12 @@
     website: registry.fedoraproject.org
     destname: registry
     proxyurl: http://localhost:10048
-    when: env == "production"
 
   - role: httpd/reverseproxy
     website: registry.fedoraproject.org
     destname: registry
     proxyurl: "{{ varnish_url }}"
-    when: env == "staging"
+    when: env == "maybe-staging"
 
   - role: httpd/reverseproxy
     website: candidate-registry.fedoraproject.org
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf
index ed1e685589..ab464d2d8d 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf
@@ -3,7 +3,7 @@ RequestHeader set X-Scheme https early
 RequestHeader set X-Forwarded-Proto https early
 ProxyPreserveHost On
 
-{% if env == "staging" %}
+{% if env == "maybe-in-staging" %}
 RewriteRule ^/v2/([a-zA-Z]*)/blobs/([a-zA-Z]*) https://ourregistry/v2/$1/blobs/$2 [R]
 {% endif %}