diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index e8456c038146..a3b73b7aef18 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -6,7 +6,7 @@ case "$1" in
 		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz"
 	;;
 	java18)
-		 echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-03-17-09-00-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-03-17-09-00.tar.gz"
+		 echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18%2B36/OpenJDK18U-jdk_x64_linux_hotspot_18_36.tar.gz"
 	;;
   *)
 		echo $"Unknown java version"
diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh
index e7cc0968cd38..3d67c7773ea6 100755
--- a/ci/scripts/detect-jdk-updates.sh
+++ b/ci/scripts/detect-jdk-updates.sh
@@ -21,7 +21,7 @@ case "$JDK_VERSION" in
 		 ISSUE_TITLE="Upgrade Java 17 version in CI image"
 	;;
 	java18)
-		 BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/18/ea"
+		 BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/18/ga"
 		 ISSUE_TITLE="Upgrade Java 18 version in CI image"
 	;;
 	*)