diff --git a/bucket/pypy2.json b/bucket/pypy2.json
index 784e5d36be..f1bdcd38eb 100644
--- a/bucket/pypy2.json
+++ b/bucket/pypy2.json
@@ -15,10 +15,10 @@
         "regex": "pypy(?<py>2[\\d.]+)-v([\\d.]+)"
     },
     "autoupdate": {
-        "url": "https://downloads.python.org/pypy$matchPy-v$version-win32.zip",
-        "extract_dir": "pypy$matchPy-v$version-win32",
+        "url": "https://downloads.python.org/pypy/pypy$matchPy-v$version-win32.zip",
         "hash": {
             "url": "https://www.pypy.org/download.html"
-        }
+        },
+        "extract_dir": "pypy$matchPy-v$version-win32"
     }
 }
diff --git a/bucket/pypy3.json b/bucket/pypy3.json
index b0ee70b612..b35b406947 100644
--- a/bucket/pypy3.json
+++ b/bucket/pypy3.json
@@ -3,9 +3,9 @@
     "description": "A fast, compliant alternative implementation of the Python language.",
     "homepage": "https://www.pypy.org",
     "license": "MIT",
-    "url": "https://downloads.python.org/pypy/pypy3.6-v7.3.2-win32.zip",
-    "hash": "13a39d46340afed20f11de24e9068968386e4bb7c8bd168662711916e2bf1da6",
-    "extract_dir": "pypy3.6-v7.3.2-win32",
+    "url": "https://downloads.python.org/pypy/pypy3.7-v7.3.2-win32.zip",
+    "hash": "e3c589be07760bc3042981c379b7fd1603e832a4db426075f09e090473846a96",
+    "extract_dir": "pypy3.7-v7.3.2-win32",
     "bin": [
         "pypy3.exe",
         "pypy3w.exe"
@@ -16,9 +16,9 @@
     },
     "autoupdate": {
         "url": "https://downloads.python.org/pypy/pypy$matchPy-v$version-win32.zip",
-        "extract_dir": "pypy$matchPy-v$version-win32",
         "hash": {
             "url": "https://www.pypy.org/download.html"
-        }
+        },
+        "extract_dir": "pypy$matchPy-v$version-win32"
     }
 }