diff --git a/java/Dockerfile b/java/Dockerfile
index 5eee66e..051c27b 100644
--- a/java/Dockerfile
+++ b/java/Dockerfile
@@ -1,9 +1,9 @@
-FROM maven:3-jdk-11-slim AS package
+FROM maven:3-eclipse-temurin-21-alpine AS package
 
 COPY java/common /vulnfunc/java/common
-RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
+RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
-FROM openjdk:11-jre-slim
+FROM openjdk:21-slim
 RUN apt-get update ; apt-get install --no-install-recommends -y zip
 COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
 COPY java/common/*.sh /vulnfunc/java/common/
diff --git a/java/gradle/Dockerfile b/java/gradle/Dockerfile
index dc98b66..26ff3a6 100644
--- a/java/gradle/Dockerfile
+++ b/java/gradle/Dockerfile
@@ -1,9 +1,9 @@
-FROM maven:3-jdk-11-slim AS package
+FROM maven:3-eclipse-temurin-21-alpine AS package
 
 COPY java/common /vulnfunc/java/common
-RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
+RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
-FROM gradle:jre11
+FROM gradle:jdk21
 RUN apt-get update ; apt-get install --no-install-recommends -y zip
 COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
 COPY java/common/*.sh /vulnfunc/java/common/
diff --git a/java/maven/Dockerfile b/java/maven/Dockerfile
index 075df46..34ebc9a 100644
--- a/java/maven/Dockerfile
+++ b/java/maven/Dockerfile
@@ -1,10 +1,10 @@
-FROM maven:3-jdk-11-slim AS package
+FROM maven:3-eclipse-temurin-21-alpine AS package
 
 COPY java/common /vulnfunc/java/common
-RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
+RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
-FROM maven:3-jdk-11-slim
-RUN apt-get update ; apt-get install --no-install-recommends -y zip
+FROM maven:3-eclipse-temurin-21-alpine
+RUN apk add zip
 COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
 COPY java/common/*.sh /vulnfunc/java/common/
 COPY java/maven/*.sh /vulnfunc/java/maven/