diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
index d53d2781..d3ece68d 100755
--- a/.github/workflows/build.sh
+++ b/.github/workflows/build.sh
@@ -7,10 +7,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 fi
 
 if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
-  if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then
+  MB_PYTHON_OSX_VER="10.9"
+  if [[ "$PLAT" == "i686" ]]; then
     DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
   else
-    MB_PYTHON_OSX_VER="10.9"
+    DOCKER_TEST_IMAGE="multibuild/focal_$PLAT"
   fi
 fi