diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 39cf051278..8cdc76229e 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -15,7 +15,7 @@ case "$1" in
 		 echo "https://github.com/bell-sw/Liberica/releases/download/20.0.2+10/bellsoft-jdk20.0.2+10-linux-amd64.tar.gz"
 	;;
 	java21)
-		 echo "https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz"
+		 echo "https://github.com/bell-sw/Liberica/releases/download/21+37/bellsoft-jdk21+37-linux-amd64.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index ea478d89e1..c1d1d7c3df 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -359,6 +359,12 @@ jobs:
       params:
         <<: *github-task-params
         JDK_VERSION: java20
+    - task: detect-jdk21-update
+      image: ci-image
+      file: git-repo/ci/tasks/detect-jdk-updates.yml
+      params:
+        <<: *github-task-params
+        JDK_VERSION: java21
 - name: detect-ubuntu-image-updates
   plan:
   - get: git-repo
diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh
index 02aaec78c1..6cd4651024 100755
--- a/ci/scripts/detect-jdk-updates.sh
+++ b/ci/scripts/detect-jdk-updates.sh
@@ -24,6 +24,10 @@ case "$JDK_VERSION" in
 		 BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=20"
 		 ISSUE_TITLE="Upgrade Java 20 version in CI image"
 	;;
+	java21)
+		 BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=21"
+		 ISSUE_TITLE="Upgrade Java 21 version in CI image"
+	;;
 	*)
 		echo $"Unknown java version"
 		exit 1;