diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 8dd17404a2..c87677f638 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -666,7 +666,7 @@
 
   - role: httpd/website
     site_name: registry.fedoraproject.org
-    server_aliases: [registry.stg.fedoraproject.org]
+    server_aliases: [registry.stg.fedoraproject.org registry-no-cdn.fedoraproject.org]
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
index 8a97f39afa..26866abf27 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
@@ -5,7 +5,8 @@ ProxyPreserveHost On
 
 
 {% if env == "production" %}
-RewriteCond %{HTTP:VIA} !cdn77
+RewriteCond %{HTTP:VIA} !cdn77 [OR]
+RewriteCond %{SERVER_NAME} !^registry-no-cdn\.fedoraproject.org$
 RewriteCond %{REQUEST_METHOD} !^(PATCH|POST|PUT|DELETE|HEAD)$
 RewriteRule ^/v2/(.*)/blobs/([a-zA-Z0-9:]*) https://cdn.registry.fedoraproject.org/v2/$1/blobs/$2 [R]
 {% endif %}