diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh
index 58e940173cc..841e76281c6 100644
--- a/.github/scripts/update-version.sh
+++ b/.github/scripts/update-version.sh
@@ -7,7 +7,7 @@ UPSTREAM_REMOTE=$1
 # Load the current OpenJDK version
 source make/conf/version-numbers.conf
 
-BUILD_NUMBER=$(git ls-remote --tags ${UPSTREAM_REMOTE} |grep jdk-${DEFAULT_VERSION_FEATURE}+ | grep -vE "(-ga|{})$" | cut -d+ -f 2 |sort -n |tail -1)
+BUILD_NUMBER=$(git ls-remote --tags ${UPSTREAM_REMOTE} |grep jdk-${DEFAULT_VERSION_FEATURE}.${DEFAULT_VERSION_INTERIM}.${DEFAULT_VERSION_UPDATE} | grep -vE "(-ga|{})$" | cut -d+ -f 2 |sort -n |tail -1)
 
 # Load the current Corretto version
 CURRENT_VERSION=$(cat version.txt)