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/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