diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index bb2433ccfc..3cb32aa888 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -872,13 +872,3 @@
     website: qa.fedoraproject.org
     path: /
     target: https://fedoraproject.org/wiki/QA
-
-  # redirects for debuginfod main page; subdirs are reverse-proxied
-  - role: httpd/redirect
-    shortname: debuginfod
-    website: debuginfod.fedoraproject.org
-    regex: ^/$
-    target: https://fedoraproject.org/wiki/Debuginfod
-    tags:
-    - debuginfod
-    
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf
index 8093cd40bc..0300d06b29 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf
@@ -1,15 +1,17 @@
 
-# Broadly reverse-proxy
-ProxyPassMatch "^/(.*)$" "{{proxyurl}}/$1" {{proxyopts}}
+# Reverse-proxy /buildid/* queries
+ProxyPassMatch "^/buildid/(.*)$" "{{proxyurl}}/buildid/$1" {{proxyopts}}
+
+# Reverse-proxy /metrics - without (...) grouping op, URL just gets copied
+ProxyPassMatch "^/metrics$" "{{proxyurl}}" {{proxyopts}}
+
 ProxyPassReverse / {{proxyurl}}/
 
 # ... but not the top level, which is instead redirected
 ProxyPass / !
 
-# ... configure this redirect in playbooks/include/proxies-redirects.yml
-# Redirect permanent / https://fedoraproject.org/wiki/Debuginfod
-# (or e.g.,)
-# Redirect permanent / https://sourceware.org/elfutils/Debuginfod.html
+# Redirect / URL over to wiki
+Redirect permanent / https://fedoraproject.org/wiki/Debuginfod
 
 # test it with:
 #