diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml
index 2ceab05107..12255708ac 100644
--- a/playbooks/include/proxies-certificates.yml
+++ b/playbooks/include/proxies-certificates.yml
@@ -19,9 +19,9 @@
     certname: wildcard-2017.fedoraproject.org
     SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert
 
-  - role: httpd/certificate
-    certname: wildcard-2017.fedorahosted.org
-    SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
+  # - role: httpd/certificate
+  #   certname: wildcard-2017.fedorahosted.org
+  #   SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
 
   - role: httpd/certificate
     certname: wildcard-2017.id.fedoraproject.org
diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index 0add2a9c90..a15751d1a6 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -550,10 +550,11 @@
     website: port389.org
     target: https://directory.fedoraproject.org/
 
-  - role: httpd/redirect
-    shortname: k12linux
-    website: k12linux.org
-    target: https://fedorahosted.org/k12linux/
+  # comment out 2020-02-05 .. this has been broken for 2 years
+  # - role: httpd/redirect
+  #   shortname: k12linux
+  #   website: k12linux.org
+  #   target: https://fedorahosted.org/k12linux/
 
   - role: httpd/redirect
     shortname: dogtagpki
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index bbe0674a5a..0d2da59717 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -746,8 +746,8 @@
     site_name: lists.fedorahosted.org
     server_aliases: [lists.stg.fedorahosted.org]
     sslonly: true
-    SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
-    cert_name: wildcard-2017.fedorahosted.org
+    certbot: true
+    tags: fedorahosted
 
   - role: httpd/website
     site_name: "id{{ env_suffix }}.fedoraproject.org"
@@ -1007,15 +1007,9 @@
   - role: httpd/website
     site_name: fedorahosted.org
     sslonly: true
-    server_aliases: [bzr.fedorahosted.org hg.fedorahosted.org svn.fedorahosted.org]
-    SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
-    cert_name: wildcard-2017.fedorahosted.org
-
-  - role: httpd/website
-    site_name: git.fedorahosted.org
-    sslonly: true
-    SSLCertificateChainFile: wildcard-2017.fedorahosted.org.intermediate.cert
-    cert_name: wildcard-2017.fedorahosted.org
+    server_aliases: [git.fedorahosted.org bzr.fedorahosted.org hg.fedorahosted.org svn.fedorahosted.org]
+    certbot: true
+    tags: fedorahosted
 
 # planet.fedoraproject.org is not to be used, it's fedoraplanet.org
 # We only have it here so we can redirect it with the correct cert