diff --git a/ansible/roles/docker/templates/debian10_armv7l.Dockerfile.j2 b/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2
similarity index 94%
rename from ansible/roles/docker/templates/debian10_armv7l.Dockerfile.j2
rename to ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2
index 6c3e3ccaf..d9094bedc 100644
--- a/ansible/roles/docker/templates/debian10_armv7l.Dockerfile.j2
+++ b/ansible/roles/docker/templates/debian11_armv7l.Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM arm32v7/debian:10
+FROM arm32v7/debian:11
 
 ENV LC_ALL C
 ENV USER {{ server_user }}
@@ -16,11 +16,11 @@ ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
       curl \
-      g++-8 \
-      gcc-8 \
+      g++-10 \
+      gcc-10 \
       git \
       libfontconfig1 \
-      openjdk-11-jre-headless \
+      openjdk-17-jre-headless \
       pkg-config \
       procps \
       python3-pip \
diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy
index 3b3c4f398..4074ed7cd 100644
--- a/jenkins/scripts/VersionSelectorScript.groovy
+++ b/jenkins/scripts/VersionSelectorScript.groovy
@@ -35,7 +35,6 @@ def buildExclusions = [
   [ /^centos7-ppcle/,                 anyType,     gte(18) ],
 
   // ARM  --------------------------------------------------
-  [ /^debian10-armv7l$/,                             anyType, gte(20) ], // gcc 10 requires newer libstdc++
   [ /^cross-compiler-ubuntu1604-armv[67]-gcc-4.9/,   anyType, gte(16) ],
   [ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/,     anyType, gte(16) ],
   [ /^cross-compiler-ubuntu1804-armv7-gcc-6/,        anyType, gte(16) ],