diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index 16dea1ca73..0c84ebe609 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -561,13 +561,13 @@
     website: pki.fedoraproject.org
     target: http://dogtagpki.org/
 
-    # all of this goes to one place the graveyard.
-  - role: httpd/redirectmatch
-    shortname: keys
-    website: keys.fedoraproject.org
-    regex: /(.*)$
-    target: https://fedoraproject.org/wiki/Infrastructure/graveyard
-    tags: keys
+  #   # all of this goes to one place the graveyard.
+  # - role: httpd/redirectmatch
+  #   shortname: keys
+  #   website: keys.fedoraproject.org
+  #   regex: /(.*)$
+  #   target: https://fedoraproject.org/wiki/Infrastructure/graveyard
+  #   tags: keys
 
   - role: httpd/redirectmatch
     shortname: boot
diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml
index db1aff6659..774ec6fbbd 100644
--- a/playbooks/include/proxies-rewrites.yml
+++ b/playbooks/include/proxies-rewrites.yml
@@ -13,6 +13,15 @@
 
   roles:
 
+
+  - role: httpd/domainrewrite
+    destname: keys-rewrite
+    website: keys.fedoraproject.org
+    path: ^/.*$
+    status: 301
+    target: https://fedoraproject.org/wiki/Infrastructure/graveyard
+    tags: keys
+
   - role: httpd/domainrewrite
     destname: admin
     website: admin.fedoraproject.org