diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 22f560fe2..99fb9a645 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -752,7 +752,7 @@ jobs:
     timeout-minutes: 30
     services:
       solr:
-        image: bitnami/solr:8.8.2
+        image: bitnamilegacy/solr:8.8.2
         env:
           SOLR_CORE: collection
         ports:
@@ -1014,7 +1014,7 @@ jobs:
     timeout-minutes: 30
     services:
       zookeeper:
-        image: bitnami/zookeeper:3.9.1
+        image: bitnamilegacy/zookeeper:3.9.1
         env:
           ALLOW_ANONYMOUS_LOGIN: yes
 
diff --git a/tox.ini b/tox.ini
index c8dae71ae..b5ced6483 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,7 +86,8 @@ envlist =
     python-adapter_gunicorn-{py37,py38,py39,py310,py311,py312,py313}-aiohttp03-gunicornlatest,
     python-adapter_hypercorn-{py38,py39,py310,py311,py312,py313}-hypercornlatest,
     python-adapter_hypercorn-py38-hypercorn{0010,0011,0012,0013},
-    python-adapter_mcp-{py310,py311,py312,py313,pypy310},
+    ; mcp tests on PyPy disabled for now due to issues building cryptography
+    python-adapter_mcp-{py310,py311,py312,py313},
     python-adapter_uvicorn-{py37,py38,py39,py310,py311,py312,py313}-uvicornlatest,
     python-adapter_uvicorn-py38-uvicorn014,
     python-adapter_waitress-{py37,py38,py39,py310,py311,py312,py313}-waitresslatest,