diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml
index b231f165..b6e73f53 100644
--- a/cibuildwheel/resources/build-platforms.toml
+++ b/cibuildwheel/resources/build-platforms.toml
@@ -31,7 +31,7 @@ python_configurations = [
   { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
   { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
   { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
-  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.4-osx64.tar.bz2" },
+  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5rc2-osx64.tar.bz2" },
 ]
 
 [windows]
@@ -44,5 +44,5 @@ python_configurations = [
   { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
   { identifier = "cp39-win32", version = "3.9.5", arch = "32" },
   { identifier = "cp39-win_amd64", version = "3.9.5", arch = "64" },
-  { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.4-win64.zip" },
+  { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5rc2-win64.zip" },
 ]
diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg
index 6a5c392b..e1706101 100644
--- a/cibuildwheel/resources/pinned_docker_images.cfg
+++ b/cibuildwheel/resources/pinned_docker_images.cfg
@@ -11,7 +11,7 @@ manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-16-606ba6c
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-16-606ba6c
 
 [pypy_x86_64]
-manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2021-05-08-8650a6d
+manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.5rc2
 
 [aarch64]
 manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-16-606ba6c
diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py
index 9ccdba79..d6288753 100644
--- a/unit_test/main_tests/main_options_test.py
+++ b/unit_test/main_tests/main_options_test.py
@@ -81,9 +81,9 @@ def test_empty_selector(platform, intercepted_build_args, monkeypatch):
         ("i686", "manylinux2014", "quay.io/pypa/manylinux2014_i686:*"),
         ("i686", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_i686:*"),
         ("i686", "custom_image", "custom_image"),
-        ("pypy_x86_64", None, "pypywheels/manylinux2010-pypy_x86_64:*"),
+        ("pypy_x86_64", None, "yannickjadoul/manylinux2010-pypy_x86_64:*"),
         ("pypy_x86_64", "manylinux1", "manylinux1"),  # Does not exist
-        ("pypy_x86_64", "manylinux2010", "pypywheels/manylinux2010-pypy_x86_64:*"),
+        ("pypy_x86_64", "manylinux2010", "yannickjadoul/manylinux2010-pypy_x86_64:*"),
         ("pypy_x86_64", "manylinux2014", "manylinux2014"),  # Does not exist (yet)
         ("pypy_x86_64", "custom_image", "custom_image"),
     ],