diff --git a/Dockerfile b/Dockerfile
index a7ece2a7914052bdb52d9c20c135fa0fedd78163..39430dea7407599057b14dc0fff1e10ca2244d36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17.0.3-alpine as corretto-jdk
+FROM amazoncorretto:21-alpine as corretto-jdk
 
 ENV BASEDIR /data
 ENV TESTDIR $BASEDIR/test
@@ -11,7 +11,7 @@ RUN mkdir -p $TESTDIR \
     && mkdir $RESULTDIR \
     && mkdir -p /$LIBSDIR/additional
 
-ADD target/dta-jdk17-junit5-runner-jar-with-dependencies.jar /$BASEDIR/app.jar
+ADD target/dta-jdk21-junit5-runner-jar-with-dependencies.jar /$BASEDIR/app.jar
 ADD https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.10.0/junit-jupiter-api-5.10.0.jar /$LIBSDIR/
 ADD https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.10.0/junit-jupiter-engine-5.10.0.jar /$LIBSDIR/
 ADD https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/1.10.0/junit-platform-engine-1.10.0.jar /$LIBSDIR/
diff --git a/pom.xml b/pom.xml
index bbfb737a94a21bb837648af139bcf6842a2f86d6..9c20b685d6c11dd33b396d18e2c1fec7af82ae5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,15 +5,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.hftstuttgart</groupId>
-    <artifactId>dta-jdk17-junit5-runner</artifactId>
+    <artifactId>dta-jdk21-junit5-runner</artifactId>
     <version>${env.BUILD_NUMBER}</version>
     <packaging>jar</packaging>
 
     <properties>
         <buildNumber>${env.BUILD_NUMBER}</buildNumber>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>