diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe785b34dd..115599843fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,5 +13,5 @@
 - Added node epoch and computed slot to the sync committee duties failure message for more context about the failure condition.
 - Updated third party libraries.
 - Added an info message on startup for the highest supported milestone and associated epoch.
-
+- Added jdk 24 docker image build.
 ### Bug Fixes
\ No newline at end of file
diff --git a/docker/jdk24/Dockerfile b/docker/jdk24/Dockerfile
index b01238bf1fd..b8d6cae574b 100644
--- a/docker/jdk24/Dockerfile
+++ b/docker/jdk24/Dockerfile
@@ -2,8 +2,13 @@ FROM eclipse-temurin:24 as jre-build
 
 # Create a custom Java runtime
 RUN JAVA_TOOL_OPTIONS="-Djdk.lang.Process.launchMechanism=vfork" $JAVA_HOME/bin/jlink \
+         --add-modules java.base \
          --add-modules java.se \
+         --add-modules java.management \
+         --add-modules java.prefs \
          --add-modules jdk.httpserver \
+         --add-modules jdk.unsupported \
+         --add-modules jdk.jdwp.agent \
          --strip-debug \
          --no-man-pages \
          --no-header-files \