diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json
index 08b5cb6607e98..df3326002a2ad 100644
--- a/dev-support/docker/pkg-resolver/packages.json
+++ b/dev-support/docker/pkg-resolver/packages.json
@@ -270,18 +270,21 @@
       "temurin-24-jdk",
       "openjdk-8-jdk",
       "openjdk-11-jdk",
-      "openjdk-17-jdk"
+      "openjdk-17-jdk",
+      "openjdk-21-jdk"
     ],
     "ubuntu:noble": [
       "temurin-24-jdk",
       "openjdk-11-jdk",
-      "openjdk-17-jdk"
+      "openjdk-17-jdk",
+      "openjdk-21-jdk"
     ],
     "ubuntu:focal::arch64": [
       "temurin-24-jdk",
       "openjdk-8-jdk",
       "openjdk-11-jdk",
-      "openjdk-17-jdk"
+      "openjdk-17-jdk",
+      "openjdk-21-jdk"
     ]
   },
   "pinentry-curses": {