diff --git a/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2
similarity index 81%
rename from ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2
rename to ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2
index 9fa1332e6..842854ef4 100644
--- a/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2
+++ b/ansible/roles/docker/templates/debian13_armv7l.Dockerfile.j2
@@ -1,11 +1,11 @@
-FROM arm32v7/debian:11
+FROM arm32v7/debian:13
 
 ENV LC_ALL C
 ENV USER {{ server_user }}
 ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }}
 ENV SHELL /bin/bash
 ENV HOME /home/{{ server_user }}
-ENV PATH /usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /usr/local/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
@@ -16,20 +16,22 @@ ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
       curl \
-      g++-10 \
-      gcc-10 \
+      g++ \
+      gcc \
       git \
       libfontconfig1 \
-      openjdk-17-jre-headless \
+      openjdk-25-jre-headless \
       pkg-config \
       procps \
       python3-pip \
+      python3-venv \
       xz-utils
 
 # Prevent Node.js picking up the OS's openssl.cnf, https://github.com/nodejs/node/issues/27862
 ENV OPENSSL_CONF /dev/null
 
-RUN pip3 install tap2junit=={{ tap2junit_version }}
+RUN python3 -m venv /usr/local/venv \
+  && /usr/local/venv/bin/pip3 install tap2junit=={{ tap2junit_version }}
 
 RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
 
diff --git a/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
index 6f78f6339..24af68057 100644
--- a/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204.Dockerfile.j2
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
     g++-12 \
     gcc-12 \
     git \
-    openjdk-17-jre-headless \
+    openjdk-25-jre-headless \
     curl \
     python3-pip \
     python-is-python3 \
diff --git a/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
index accc17f70..4b37c8c2c 100644
--- a/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204_armv7l.Dockerfile.j2
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
       g++-12 \
       gcc-12 \
       git \
-      openjdk-17-jre-headless \
+      openjdk-25-jre-headless \
       pkg-config \
       curl \
       python3-pip \
diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
index 45a07b2fb..91aae89d2 100644
--- a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install apt-utils -y && \
       g++-12 \
       gcc-12 \
       git \
-      openjdk-17-jre-headless \
+      openjdk-25-jre-headless \
       pkg-config \
       curl \
       python3-pip \