diff --git a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
index 8ac75b22e0..5b877aee8d 100644
--- a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
+++ b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
@@ -3,9 +3,13 @@
 #
 {% if env == "staging" %}
 Redirect /publiclist https://admin.stg.fedoraproject.org/mirrormanager
+RewriteEngine On
+RewriteRule ^/publiclist/(.+[^/])/?$ https://admin.stg.fedoraproject.org/mirrormanager/mirrors/$1 [R,L]
 {% else %}
 Redirect /publiclist https://admin.fedoraproject.org/mirrormanager
 Alias /static /var/lib/mirrormanager/mirrorlists/static/
+RewriteEngine On
+RewriteRule ^/publiclist/(.+[^/])/?$ https://admin.fedoraproject.org/mirrormanager/mirrors/$1 [R,L]
 {% endif %}
 
 <Directory /var/lib/mirrormanager/mirrorlists>