diff --git a/Vagrantfile b/Vagrantfile
index e570201c..00f8d4bf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,7 +15,6 @@ SERVERS = [
   "mail",
   "moin",
   "planet",
-  "pypy-web",
   "pythontest",
 ]
 
diff --git a/pillar/base/haproxy.sls b/pillar/base/haproxy.sls
index 22e145b0..889a075d 100644
--- a/pillar/base/haproxy.sls
+++ b/pillar/base/haproxy.sls
@@ -67,14 +67,6 @@ haproxy:
       verify_host: planet.psf.io
       check: "HEAD / HTTP/1.1\\r\\nHost:\\ planet.psf.io"
 
-    pypy-web:
-      domains:
-        - www.pypy.org
-      hsts_subdomains: False
-      hsts_preload: False
-      verify_host: pypy-web.psf.io
-      check: "HEAD / HTTP/1.1\\r\\nHost:\\ pypy-web.psf.io"
-
     moin:
       domains:
         - wiki.python.org
@@ -144,11 +136,6 @@ haproxy:
       target: www.jython.org
       hsts_subdomains: False
       hsts_preload: False
-    pypy.org:
-      target: www.pypy.org
-      hsts_subdomains: False
-      hsts_preload: False
-      tls: False
 
   listens:
     hg_ssh:
diff --git a/pillar/base/tls.sls b/pillar/base/tls.sls
index fee45915..7de3c122 100644
--- a/pillar/base/tls.sls
+++ b/pillar/base/tls.sls
@@ -57,7 +57,3 @@ tls:
     svn.psf.io:
       roles:
         - hg
-
-    pypy-web.psf.io:
-      roles:
-        - pypy-web
diff --git a/pillar/base/users.sls b/pillar/base/users.sls
index 34cfdbfc..f1ba4419 100644
--- a/pillar/base/users.sls
+++ b/pillar/base/users.sls
@@ -348,9 +348,6 @@ users:
       codespeed:
         sudo: True
         allowed: True
-      pypy-web:
-        sudo: True
-        allowed: True
 
   fijal:
     fullname: "Maciej Fijalkowski"
@@ -360,9 +357,6 @@ users:
       codespeed:
         sudo: True
         allowed: True
-      pypy-web:
-        sudo: True
-        allowed: True
 
   ezio:
     fullname: "Ezio Melotti"
diff --git a/pillar/dev/roles.sls b/pillar/dev/roles.sls
index cd359839..b9c7b12a 100644
--- a/pillar/dev/roles.sls
+++ b/pillar/dev/roles.sls
@@ -70,10 +70,6 @@ roles:
     pattern: "planet.vagrant.psf.io"
     purpose: ""
     contact: ""
-  pypy-web:
-    pattern: "pypy-web.vagrant.psf.io"
-    purpose: ""
-    contact: ""
   pythontest:
     pattern: "pythontest.vagrant.psf.io"
     purpose: ""
diff --git a/pillar/dev/secrets/tls/certs/loadbalancer.sls b/pillar/dev/secrets/tls/certs/loadbalancer.sls
index 457beb23..c8f5fea5 100644
--- a/pillar/dev/secrets/tls/certs/loadbalancer.sls
+++ b/pillar/dev/secrets/tls/certs/loadbalancer.sls
@@ -210,58 +210,6 @@ tls:
       ogsOBi74M0k7Ihp96JK6lUXTY+WnlJ3C9FZdByeXq6O4HLhgq5jug7E=
       -----END CERTIFICATE-----
 
-    pypy.org: |
-      -----BEGIN PRIVATE KEY-----
-      MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCSNloTX8Ut5t4v
-      M8MDD0gzrRWKFwcqDbvMa/JkK89hfoSfAnZwIHtZl+PTHCOXqU4WEMvYwSIcqVlD
-      bOfTDLklwFvMxwzj4/TJbXrHtPf6wFRQa2KUrewy+KcpZBERJcEhJ1PwRHe4bY+n
-      t4L+gDcRVoLmZXUpxasMeBHXD8ZqY9v7BXS2Z4qNnKu7/nABK7yR0DF/epYXxNPf
-      aGL8qEfXsWhc3278MCsipokYFOOVhVxPyJ0xny065L1lX51GChr6kSMNAdV6/Zju
-      vDMmFJp4AbZQ8ta/QdppGEe/cFDGg4VNpinlZ8vQJ01hTON9TxlJqG0oFDmplGCU
-      a+SFiLQLAgMBAAECggEANYChDnTdlPHlvNUOl7iIXayI9Lp/eyKCZYfcr04euVjQ
-      E9WVXGtuZ7b+fZpO5ejks4ta5Iqrvlwz10nrPN3rhEZy8SinbV7VjL28j4aHtaCa
-      WcEp1ikchPxbQvikjCdKGCUpgIK1Ym3pAuDSlOl6/SOwi7l1mZ8E+++V66IQo44w
-      cP+64sm4VIS3kVNhNxB619gXcmldo7N5fC7eF8K8wNnCXSlJA8BqrW/OAAUSl4Lp
-      rn7BkxSdcISejA/n9QoGkKOd6XZ7vzMV4hseFzisn9xGkRWx6zdZsfcuzeZ10p7E
-      pxNCA1g7l1xxYTUIDNBmMImtUsbIH0INXiu2MCXJbQKBgQDC9fb0ZJCJN8hpqb3+
-      Zw1FxjNAs8eqTwaohc7H3n+DSeBLZi63wKe8gO1sPcvwFx2/8U6oQS9lo2xOaDuu
-      Fv4S57jIOoTIxt2Ax/eVTlGh/3EHXqACUQn/qXCdHLtO0sTnnr3WpA15Q8JrjTHU
-      RePRI2xqCTkC4e4GWBKN6fTwtwKBgQC//TbPlf949KI6scnh8foFXEepPelfhUl2
-      zGj78stXSOkHJ9oYWNYVBH4lL7GrsYryr+6Ndr8Di7o45FD/iHBSMWfJluRDUH42
-      yU3Ro54ECBBChI+9n+QUL9gUZBBfJgBDfiKHdbMrmD+IkD8QKFNHf7UdcgB/RG/+
-      nFjzP08bTQKBgAVPX7eOWaVzIIFIP0WDlwf0ewbjHqgT2PGUG2q0M7LmuzYyhUk5
-      9RecR1swX7KdXpEQyHyqsdjJ17RXAHEgbTEkoJLLjTxOtk/AooytgmmwJGr399G4
-      VVZiTg/pbWybLwPD/hWviDJqVwxI3zeR47+ZgGVu9N+QOcRwd6jn22UHAoGAdSTX
-      sMnhW7hI1G9us0KmP2cTAp0YLIRzUt1eoXx/vf5q0UbruDdcSO642Y/EZPKryXC3
-      qfFuk4dKVTRah9CEWGJ05XgAR2Jx4JPru6KN4//Xi/6+hgFtdTPMMITtyGCzgHsS
-      Ln0OmecHvRfmosE4L0QpCpJo4z6q5zwWujVC23ECgYAi1r+27xBjVtSvsd7xkBfY
-      R2HpqcSHaMedQZ2DY/LU6OH5O1RxQsgeSYyiiHMjN9ij3IUv+JHcxaotcSUQIWEa
-      YJmAMhl5ZEfYzpMJ9PUQymN59AAGuTr2PYjc9fhZm5/EgpxC2cl/AR2nS3U19dwf
-      N5zICLLKa7f4hPvAFf33Lg==
-      -----END PRIVATE KEY-----
-      -----BEGIN CERTIFICATE-----
-      MIIDtTCCAp2gAwIBAgIUHTES3WH58IHxo9rMUzj/DeytPc8wDQYJKoZIhvcNAQEL
-      BQAwajELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk9SMRIwEAYDVQQHDAlCZWF2ZXJ0
-      b24xIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRUwEwYDVQQD
-      DAwqLnB5dGhvbi5vcmcwHhcNMjQwNzE3MTgyNTAxWhcNMzQwNzE1MTgyNTAxWjBq
-      MQswCQYDVQQGEwJVUzELMAkGA1UECAwCT1IxEjAQBgNVBAcMCUJlYXZlcnRvbjEj
-      MCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRpb24xFTATBgNVBAMMDCou
-      cHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJI2WhNf
-      xS3m3i8zwwMPSDOtFYoXByoNu8xr8mQrz2F+hJ8CdnAge1mX49McI5epThYQy9jB
-      IhypWUNs59MMuSXAW8zHDOPj9Mltese09/rAVFBrYpSt7DL4pylkERElwSEnU/BE
-      d7htj6e3gv6ANxFWguZldSnFqwx4EdcPxmpj2/sFdLZnio2cq7v+cAErvJHQMX96
-      lhfE099oYvyoR9exaFzfbvwwKyKmiRgU45WFXE/InTGfLTrkvWVfnUYKGvqRIw0B
-      1Xr9mO68MyYUmngBtlDy1r9B2mkYR79wUMaDhU2mKeVny9AnTWFM431PGUmobSgU
-      OamUYJRr5IWItAsCAwEAAaNTMFEwHQYDVR0OBBYEFPJrXEC964Djv1KtiYGjRFpD
-      s8RvMB8GA1UdIwQYMBaAFPJrXEC964Djv1KtiYGjRFpDs8RvMA8GA1UdEwEB/wQF
-      MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGlJ+N5txBsBekRMkl2pGxUecihJWLXM
-      pwnXuhKswrsCpLiJlWijTWVBULfVn71rEfnMFNgdVn4i1TddgyK4cViHWZPBYcGd
-      SYbQK40xmLuIAJKM8uARdm99AmavKCH+ha6jFY8fZoU0+m51hOztXfGTIkLpLr2r
-      +0ydepkbAWqNH6NYNpUQKFxSlyTYvwaHUh0YzXMxgOj+foJCygyVnB/E7Fja92Ho
-      Pe93No9Ze0Jou4GsXmP2E1YY0i3jkCigmuVTQSrl85uxxHfHWNgr9OwN8ASoF9dp
-      ogsOBi74M0k7Ihp96JK6lUXTY+WnlJ3C9FZdByeXq6O4HLhgq5jug7E=
-      -----END CERTIFICATE-----
-
     www.pycon.org: |
       -----BEGIN PRIVATE KEY-----
       MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCSNloTX8Ut5t4v
diff --git a/pillar/prod/roles.sls b/pillar/prod/roles.sls
index 096b8a73..734257f6 100644
--- a/pillar/prod/roles.sls
+++ b/pillar/prod/roles.sls
@@ -58,10 +58,6 @@ roles:
     pattern:  "planet*.nyc1.psf.io"
     purpose:  "Planet Python"
     contact:  "benjamin"
-  pypy-web:
-    pattern:  "pypy-web*.nyc1.psf.io"
-    purpose:  "Serves www.pypy.org"
-    contact:  "mattip, fijal"
   pythontest:
     pattern:  "pythontest*.nyc3.psf.io"
     purpose:  "Test resources for CPython's test suite."
diff --git a/pillar/prod/top.sls b/pillar/prod/top.sls
index ba57fe99..0a224e52 100644
--- a/pillar/prod/top.sls
+++ b/pillar/prod/top.sls
@@ -102,10 +102,6 @@ base:
     - firewall.http
     - firewall.planet
 
-  'pypy-web':
-    - match: nodegroup
-    - firewall.rs-lb-backend
-
   'pythontest':
     - match: nodegroup
     - firewall.http
diff --git a/salt/haproxy/config/haproxy.cfg.jinja b/salt/haproxy/config/haproxy.cfg.jinja
index 08a9acfb..ea0ee706 100644
--- a/salt/haproxy/config/haproxy.cfg.jinja
+++ b/salt/haproxy/config/haproxy.cfg.jinja
@@ -86,10 +86,9 @@ listen tls:
     bind :20006 ssl alpn h2,http/1.1 crt speed.pypy.org.pem
     bind :20007 ssl alpn h2,http/1.1 crt www.pycon.org.pem
     bind :20008 ssl alpn h2,http/1.1 crt jython.org.pem
-    bind :20009 ssl alpn h2,http/1.1 crt pypy.org.pem
-    bind 0.0.0.0:443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem crt salt-public.psf.io.pem crt planetpython.org.pem
-    bind :::443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem  crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem crt salt-public.psf.io.pem crt planetpython.org.pem
-    bind :20010 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem crt salt-public.psf.io.pem crt planetpython.org.pem
+    bind 0.0.0.0:443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt salt-public.psf.io.pem crt planetpython.org.pem
+    bind :::443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem  crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt salt-public.psf.io.pem crt planetpython.org.pem
+    bind :20010 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt salt-public.psf.io.pem crt planetpython.org.pem
 
     mode http
 
diff --git a/salt/pypy-web/config/nginx.conf.jinja b/salt/pypy-web/config/nginx.conf.jinja
deleted file mode 100644
index a63124e0..00000000
--- a/salt/pypy-web/config/nginx.conf.jinja
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-    listen 9000 ssl;
-    server_name pypy-web.psf.io;
-
-    ssl_certificate /etc/ssl/private/pypy-web.psf.io.pem;
-    ssl_certificate_key /etc/ssl/private/pypy-web.psf.io.pem;
-
-    include fastly_params;
-
-    error_log /var/log/nginx/pypy-web.error.log;
-    access_log /var/log/nginx/pypy-web.access.log;
-
-    root /srv/pypy/pypy.org;
-}
diff --git a/salt/pypy-web/init.sls b/salt/pypy-web/init.sls
deleted file mode 100644
index e85b992c..00000000
--- a/salt/pypy-web/init.sls
+++ /dev/null
@@ -1,49 +0,0 @@
-
-include:
-  - nginx
-
-pypy-web-deps:
-  pkg.installed:
-    - pkgs:
-      - git
-
-/srv/pypy:
-  file.directory:
-    - user: nginx
-    - group: nginx
-    - mode: "0755"
-    - makedirs: True
-
-/etc/nginx/sites.d/pypy-web.conf:
-  file.managed:
-    - source: salt://pypy-web/config/nginx.conf.jinja
-    - template: jinja
-    - require:
-      - file: /etc/nginx/sites.d/
-      - file: /srv/pypy
-
-pypy-web-clone:
-  git.latest:
-    - name: https://github.com/pypy/pypy.org
-    - rev: gh-pages
-    - branch: gh-pages
-    - target: /srv/pypy/pypy.org
-    - user: nginx
-    - force_checkout: True
-    - force_reset: True
-    - force_fetch: True
-    - require:
-      - pkg: pypy-web-deps
-
-/etc/consul.d/service-pypy-web.json:
-  file.managed:
-    - source: salt://consul/etc/service.jinja
-    - template: jinja
-    - context:
-        name: pypy-web
-        port: 9000
-    - user: root
-    - group: root
-    - mode: "0644"
-    - require:
-      - pkg: consul-pkgs
diff --git a/salt/top.sls b/salt/top.sls
index 8d5a6b21..4bd78f04 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -77,10 +77,6 @@ base:
     - postgresql.server
     - postgresql.admin
 
-  'pypy-web':
-    - match: nodegroup
-    - pypy-web
-
   'pythontest':
     - match: nodegroup
     - pythontest