diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 78f6cceefdb1..1410f39555a7 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -79,5 +79,10 @@ jobs:
           SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
           TAG: ${{ env.TAG }}-java17
         run: make build.all docker.push
+      - name: Build and push docker images based on Java 21
+        env:
+          SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
+          TAG: ${{ env.TAG }}-java21
+        run: make build.all docker.push
       - name: Build and push docker images
         run: make build.all docker.push
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 668a11490989..00828c256955 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,6 +5,8 @@
 * Add distribution/graal module to make preliminary preparations for supporting native-image.
 * Bump Java agent to 9.1-dev in the e2e tests.
 * Bump up netty to 4.1.100.
+* Add eclipse-temurin:21-jre as a new image runtime. Now, eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
+  eclipse-temurin:21-jre are available for every commit and release.
 
 #### OAP Server