diff --git a/.ci/build-wheels-linux.sh b/.ci/build-wheels-linux.sh
index ca4479408..d1e0a020d 100755
--- a/.ci/build-wheels-linux.sh
+++ b/.ci/build-wheels-linux.sh
@@ -43,7 +43,7 @@ make distclean;
 
 cd /io;
 for PYBIN in /opt/python/*3*/bin; do
-    if [[ $PYBIN != *"34"* ]]; then
+    if [[ $PYBIN != *"34"* && $PYBIN != *"35"* ]]; then
         "${PYBIN}/pip" install --upgrade setuptools pip;
         "${PYBIN}/pip" install --upgrade cython nose pygments docutils;
         KIVY_SPLIT_EXAMPLES=1 USE_X11=1 USE_SDL2=1 USE_PANGOFT2=0 USE_GSTREAMER=0 PKG_CONFIG_PATH="$HOME/kivy_build/lib/pkgconfig" "${PYBIN}/pip" wheel --no-deps . -w dist/;
diff --git a/.github/workflows/rpi_wheels.yml b/.github/workflows/rpi_wheels.yml
index 477b7c5fe..9ccdf9598 100644
--- a/.github/workflows/rpi_wheels.yml
+++ b/.github/workflows/rpi_wheels.yml
@@ -18,7 +18,7 @@ jobs:
     if: github.event_name == 'schedule' || (github.event_name == 'create' && github.event.ref_type == 'tag') || contains(github.event.head_commit.message, '[build wheel]') || contains(github.event.head_commit.message, '[build wheel armv7l]') || contains(github.event.pull_request.title, '[build wheel]') || contains(github.event.pull_request.title, '[build wheel armv7l]')
     strategy:
       matrix:
-        docker_images: ['balenalib/armv7hf-debian:stretch', 'balenalib/armv7hf-debian:buster']
+        docker_images: ['balenalib/armv7hf-debian:buster']
     steps:
     - uses: actions/checkout@v2
     - name: Generate version metadata