diff --git a/Dockerfile.runner-jvm b/Dockerfile.runner-jvm
index 88fc02d8a..f9296d53d 100644
--- a/Dockerfile.runner-jvm
+++ b/Dockerfile.runner-jvm
@@ -6,7 +6,7 @@ RUN apt-get install -y curl git zip
 COPY ./bin /src/bin
 ENV PATH="/src/bin:$PATH"
 ENV HERMIT_STATE_DIR=/hermit
-RUN hermit install openjdk-17.0.8_7
+RUN hermit install openjdk-21.0.3_9
 RUN mvn -B --version
 
 # Finally create the runtime image.
@@ -16,4 +16,4 @@ WORKDIR /root/
 
 ENV PATH="/root/jdk/bin:$PATH"
 ENV JAVA_HOME="/root/jdk"
-COPY --from=builder /hermit/pkg/openjdk-17.0.8_7/ /root/jdk/
+COPY --from=builder /hermit/pkg/openjdk-21.0.3_9/ /root/jdk/
diff --git a/bin/.openjdk-17.0.8_7.pkg b/bin/.openjdk-21.0.3_9.pkg
similarity index 100%
rename from bin/.openjdk-17.0.8_7.pkg
rename to bin/.openjdk-21.0.3_9.pkg
diff --git a/bin/jar b/bin/jar
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jar
+++ b/bin/jar
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jarsigner b/bin/jarsigner
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jarsigner
+++ b/bin/jarsigner
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/java b/bin/java
index 7d19c5ad1..aafd4380a 120000
--- a/bin/java
+++ b/bin/java
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/javac b/bin/javac
index 7d19c5ad1..aafd4380a 120000
--- a/bin/javac
+++ b/bin/javac
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/javadoc b/bin/javadoc
index 7d19c5ad1..aafd4380a 120000
--- a/bin/javadoc
+++ b/bin/javadoc
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/javap b/bin/javap
index 7d19c5ad1..aafd4380a 120000
--- a/bin/javap
+++ b/bin/javap
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jcmd b/bin/jcmd
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jcmd
+++ b/bin/jcmd
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jconsole b/bin/jconsole
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jconsole
+++ b/bin/jconsole
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jdb b/bin/jdb
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jdb
+++ b/bin/jdb
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jdeprscan b/bin/jdeprscan
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jdeprscan
+++ b/bin/jdeprscan
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jdeps b/bin/jdeps
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jdeps
+++ b/bin/jdeps
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jfr b/bin/jfr
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jfr
+++ b/bin/jfr
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jhsdb b/bin/jhsdb
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jhsdb
+++ b/bin/jhsdb
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jimage b/bin/jimage
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jimage
+++ b/bin/jimage
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jinfo b/bin/jinfo
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jinfo
+++ b/bin/jinfo
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jlink b/bin/jlink
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jlink
+++ b/bin/jlink
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jmap b/bin/jmap
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jmap
+++ b/bin/jmap
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jmod b/bin/jmod
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jmod
+++ b/bin/jmod
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jpackage b/bin/jpackage
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jpackage
+++ b/bin/jpackage
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jps b/bin/jps
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jps
+++ b/bin/jps
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jrunscript b/bin/jrunscript
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jrunscript
+++ b/bin/jrunscript
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jshell b/bin/jshell
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jshell
+++ b/bin/jshell
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jstack b/bin/jstack
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jstack
+++ b/bin/jstack
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jstat b/bin/jstat
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jstat
+++ b/bin/jstat
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jstatd b/bin/jstatd
index 7d19c5ad1..aafd4380a 120000
--- a/bin/jstatd
+++ b/bin/jstatd
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/jwebserver b/bin/jwebserver
new file mode 120000
index 000000000..aafd4380a
--- /dev/null
+++ b/bin/jwebserver
@@ -0,0 +1 @@
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/keytool b/bin/keytool
index 7d19c5ad1..aafd4380a 120000
--- a/bin/keytool
+++ b/bin/keytool
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/rmiregistry b/bin/rmiregistry
index 7d19c5ad1..aafd4380a 120000
--- a/bin/rmiregistry
+++ b/bin/rmiregistry
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/bin/serialver b/bin/serialver
index 7d19c5ad1..aafd4380a 120000
--- a/bin/serialver
+++ b/bin/serialver
@@ -1 +1 @@
-.openjdk-17.0.8_7.pkg
\ No newline at end of file
+.openjdk-21.0.3_9.pkg
\ No newline at end of file
diff --git a/frontend/cli/dependency-versions.txt b/frontend/cli/dependency-versions.txt
index cb859a5ac..2081cfe7c 100644
--- a/frontend/cli/dependency-versions.txt
+++ b/frontend/cli/dependency-versions.txt
@@ -1,2 +1,2 @@
-openjdk-17.0.8_7
+openjdk-21.0.3_9
 maven-3.9.9