diff --git a/.java-version b/.java-version
index a8f5438c0a58..5f39e9144690 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-21.0.1
+21.0
diff --git a/core/docker/build.sh b/core/docker/build.sh
index 51e93f66b835..8d1e1f236516 100755
--- a/core/docker/build.sh
+++ b/core/docker/build.sh
@@ -39,8 +39,8 @@ shift $((OPTIND - 1))
 SOURCE_DIR="../.."
 
 function temurin_jdk_link() {
-  JDK_VERSION="${1}"
-  ARCH="${2}"
+  local JDK_VERSION="${1}"
+  local ARCH="${2}"
 
   versionsUrl="https://api.adoptium.net/v3/info/release_names?heap_size=normal&image_type=jdk&lts=true&os=linux&page=0&page_size=20&project=jdk&release_type=ga&semver=false&sort_method=DEFAULT&sort_order=ASC&vendor=eclipse&version=%28${JDK_VERSION}%2C%5D"
   if ! result=$(curl -fLs "$versionsUrl" -H 'accept: application/json'); then