diff --git a/src/packaging/docker-build/Dockerfile b/src/packaging/docker-build/Dockerfile
index 55a52d69a..0b71a68ce 100644
--- a/src/packaging/docker-build/Dockerfile
+++ b/src/packaging/docker-build/Dockerfile
@@ -29,8 +29,7 @@ RUN apt-get update \
     && DEBIAN_FRONTEND="noninteractive" apt-get install -y \
         build-essential \
         git \
-        openjdk-8-jdk \
-        openjdk-11-jdk \
+        openjdk-21-jdk \
         maven \
         nodejs \
         python2 \
diff --git a/src/packaging/docker-build/docker-entrypoint.sh b/src/packaging/docker-build/docker-entrypoint.sh
index b82955f2c..09cf6171d 100755
--- a/src/packaging/docker-build/docker-entrypoint.sh
+++ b/src/packaging/docker-build/docker-entrypoint.sh
@@ -25,23 +25,14 @@ arch=$(dpkg-architecture -q DEB_BUILD_ARCH)
 pushd ${WORKDIR}/cassandra-reaper > /dev/null
 export VERSION=$(printf 'VER\t${project.version}' | mvn help:evaluate 2>/dev/null | grep '^VER' | cut -f2)
 echo "Building package for version ${VERSION}"
-# From version 3.1 onwards JDK11 is needed to build Reaper (e9cfc20)
 java_home=""
 java_path=""
 javac_path=""
 javadoc_path=""
-if [ "$(cut -d'.' -f1 <<<${VERSION})" -ge 3 ] && [ "$(cut -d'.' -f2 <<<${VERSION})" -ge 1 ]
-then
-  java_home="/usr/lib/jvm/java-11-openjdk-${arch}"
-  java_path="bin/java"
-  javac_path="bin/javac"
-  javadoc_path="bin/javadoc"
-else
-  java_home="/usr/lib/jvm/java-8-openjdk-${arch}"
-  java_path="jre/bin/java"
-  javac_path="bin/javac"
-  javadoc_path="bin/javadoc"
-fi
+java_home="/usr/lib/jvm/java-21-openjdk-${arch}"
+java_path="bin/java"
+javac_path="bin/javac"
+javadoc_path="bin/javadoc"
 export JAVA_HOME=${java_home}
 update-alternatives --set java "${JAVA_HOME}/${java_path}"
 update-alternatives --set javac "${JAVA_HOME}/${javac_path}"
diff --git a/src/server/pom.xml b/src/server/pom.xml
index 83e92c928..d0a5f4149 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -311,7 +311,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.4.0</version>
+            <version>5.14.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>