diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml
index 30b754534b..65d86804d0 100644
--- a/playbooks/include/proxies-certificates.yml
+++ b/playbooks/include/proxies-certificates.yml
@@ -49,6 +49,10 @@
     name: fedoramagazine.org
     SSLCertificateChainFile: fedoramagazine.org.intermediate.cert
 
+  - role: httpd/certificate
+    name: fpaste.org
+    SSLCertificateChainFile: fpaste.org.intermediate.cert
+
   - role: httpd/certificate
     name: getfedora.org
     SSLCertificateChainFile: getfedora.org.intermediate.cert
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 79ef470a8f..3f3935e9cf 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -479,18 +479,11 @@
 #
   - role: httpd/website
     name: fpaste.org
+    certbot: true
     server_aliases:
     - www.fpaste.org
     cert_name: fpaste.org
     SSLCertificateChainFile: fpaste.org.intermediate.cert
-    when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
-
-  - role: httpd/website
-    name: fpaste.org
-    server_aliases:
-    - www.fpaste.org
-    cert_name: "{{wildcard_cert_name}}"
-    when: inventory_hostname != 'proxy01.phx2.fedoraproject.org'
 
   - role: httpd/website
     name: koji.fedoraproject.org